Merge pull request #15 from KubeOperator/dev

Dev

dashboard/src/components/catalog/catalog.vue

@@ -177,7 +177,7 @@
             chartMessage() {
                 this.$message({
                 showClose: true,
-                message: '提示：Kubeapps-plus 应用商店默认是没有应用的哦！需要你手动上传 chart 离线包或者配置使用你自己的 chart 仓库。配置参考链接: https://docs.kubeoperator.io/KubeOperator-v2.4/kubeapps-plus',
+                message: '提示：Kubeapps-plus 应用商店默认是没有应用的哦！需要你手动上传 chart 离线包或者配置使用你自己的 chart 仓库。配置参考链接: https://github.com/KubeOperator/kubeapps-plus',
                 type: 'warning'
             });
             },

script/apps/argo-cd/templates/NOTES.txt

@@ -1,15 +1,41 @@
 In order to access the server UI you have the following options:
 
-1. kubectl port-forward service/{{include "argo-cd.fullname" . }}-server -n {{ .Release.Namespace }} 8080:443
+1. Get the Argo CD URL:
 
-    and then open the browser on http://localhost:8080 and accept the certificate
+{{- if .Values.server.ingress.enabled }}
 
-2. enable ingress in the values file `service.ingress.enabled` and either
-      - Add the annotation for ssl passthrough: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ingress.md#option-1-ssl-passthrough
-      - Add the `--insecure` flag to `server.extraArgs` in the values file and terminate SSL at your ingress: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ingress.md#option-2-multiple-ingress-objects-and-hosts
+  You should be able to access your new Argo CD installation through {{ include "harbor.externalUrl" . }}
+
+{{- else if contains "LoadBalancer" .Values.server.service.type }}
 
+    kubectl port-forward service/{{include "argo-cd.fullname" . }}-server -n {{ .Release.Namespace }} 8080:443
+    and then open the browser on https://localhost and accept the certificate
+
+{{- $port:=.Values.service.loadBalancer.ports.httpPort | toString }}
+    export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ .Values.service.loadBalancer.name }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+    echo "Argo CD URL: http://$SERVICE_IP{{- if ne $port "80" }}:{{ .Values.loadBalancer.ports.httpPort  }}{{ end }}/"
 
+{{- else if contains "NodePort" .Values.server.service.type }}
+    export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ template "argo-cd.server.fullname" . }})
+    export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+    echo "Argo CD URL: http://$NODE_IP:$NODE_PORT/"
+
+{{- end }}
+
+2. Get default user and password:
 After reaching the UI the first time you can login with username: admin and the password will be the
 name of the server pod. You can get the pod name by running:
 
-kubectl get pods -n {{ .Release.Namespace }} -l app.kubernetes.io/name={{ include "argo-cd.name" . }}-server -o name | cut -d'/' -f 2
+Username: 
+    admin
+Password: 
+    kubectl get pods -n {{ .Release.Namespace }} -l app.kubernetes.io/name={{ include "argo-cd.name" . }}-server -o name | cut -d'/' -f 2
+
+
+3. enable ingress in the values file `service.ingress.enabled` and either
+      - Add the annotation for ssl passthrough: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ingress.md#option-1-ssl-passthrough
+      - Add the `--insecure` flag to `server.extraArgs` in the values file and terminate SSL at your ingress: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/ingress.md#option-2-multiple-ingress-objects-and-hosts
+
+
+
+