diff --git a/charts/fission-all/templates/nonhelm-install-job.yaml b/charts/fission-all/templates/nonhelm-install-job.yaml index 8ed13aaf..08657f5b 100644 --- a/charts/fission-all/templates/nonhelm-install-job.yaml +++ b/charts/fission-all/templates/nonhelm-install-job.yaml @@ -28,5 +28,5 @@ spec: - name: post-install-job image: "fission/alpinecurl" imagePullPolicy: {{ .Values.pullPolicy }} - command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"yaml-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"] + command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"yaml-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.io/analytics || true"] {{- end }} diff --git a/charts/fission-all/templates/post-install-job.yaml b/charts/fission-all/templates/post-install-job.yaml index b5a62cc6..71dc95c0 100644 --- a/charts/fission-all/templates/post-install-job.yaml +++ b/charts/fission-all/templates/post-install-job.yaml @@ -32,5 +32,5 @@ spec: - name: post-install-job image: "fission/alpinecurl" imagePullPolicy: {{ .Values.pullPolicy }} - command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"] + command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.io/analytics || true"] {{- end }} diff --git a/charts/fission-all/templates/post-upgrade-job.yaml b/charts/fission-all/templates/post-upgrade-job.yaml index 9b787950..75957dd9 100644 --- a/charts/fission-all/templates/post-upgrade-job.yaml +++ b/charts/fission-all/templates/post-upgrade-job.yaml @@ -32,5 +32,5 @@ spec: - name: post-upgrade-job image: "fission/alpinecurl" imagePullPolicy: {{ .Values.pullPolicy }} - command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-upgrade\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"] + command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-upgrade\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.io/analytics || true"] {{- end }} diff --git a/charts/fission-all/templates/router.yaml b/charts/fission-all/templates/router.yaml index 28d4a929..5568ca03 100644 --- a/charts/fission-all/templates/router.yaml +++ b/charts/fission-all/templates/router.yaml @@ -65,10 +65,10 @@ spec: value: {{ .Values.router.displayAccessLog | default false | quote }} {{- if .Values.analytics }} - name: ANALYTICS_URL - value: "https://g.fission.sh/metrics" + value: "https://g.fission.io/metrics" {{- else if .Values.analyticsNonHelmInstall }} - name: ANALYTICS_URL - value: "https://g.fission.sh/metrics" + value: "https://g.fission.io/metrics" {{- end }} readinessProbe: httpGet: diff --git a/charts/fission-core/templates/nonhelm-install-job.yaml b/charts/fission-core/templates/nonhelm-install-job.yaml index 024f208b..58f25798 100644 --- a/charts/fission-core/templates/nonhelm-install-job.yaml +++ b/charts/fission-core/templates/nonhelm-install-job.yaml @@ -27,5 +27,5 @@ spec: containers: - name: post-install-job image: "fission/alpinecurl" - command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"yaml-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"] + command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"yaml-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.io/analytics || true"] {{- end }} diff --git a/charts/fission-core/templates/post-install-job.yaml b/charts/fission-core/templates/post-install-job.yaml index 77c8a651..d7951978 100644 --- a/charts/fission-core/templates/post-install-job.yaml +++ b/charts/fission-core/templates/post-install-job.yaml @@ -31,5 +31,5 @@ spec: containers: - name: post-install-job image: "fission/alpinecurl" - command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"] + command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-install\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.io/analytics || true"] {{- end }} diff --git a/charts/fission-core/templates/post-upgrade-job.yaml b/charts/fission-core/templates/post-upgrade-job.yaml index 6ae8b3c4..e12cb80d 100644 --- a/charts/fission-core/templates/post-upgrade-job.yaml +++ b/charts/fission-core/templates/post-upgrade-job.yaml @@ -31,5 +31,5 @@ spec: containers: - name: post-upgrade-job image: "fission/alpinecurl" - command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-upgrade\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.sh/analytics || true"] + command: ["sh", "-c", "/usr/bin/curl -m 5 -H \"Content-Type: application/json\" -X POST -d '{\"type\": \"helm-post-upgrade\", \"chartName\": \"{{ .Chart.Name }}\", \"chartVersion\": \"{{ .Chart.Version }}\"}' https://g.fission.io/analytics || true"] {{- end }} diff --git a/charts/fission-core/templates/router.yaml b/charts/fission-core/templates/router.yaml index 28d4a929..5568ca03 100644 --- a/charts/fission-core/templates/router.yaml +++ b/charts/fission-core/templates/router.yaml @@ -65,10 +65,10 @@ spec: value: {{ .Values.router.displayAccessLog | default false | quote }} {{- if .Values.analytics }} - name: ANALYTICS_URL - value: "https://g.fission.sh/metrics" + value: "https://g.fission.io/metrics" {{- else if .Values.analyticsNonHelmInstall }} - name: ANALYTICS_URL - value: "https://g.fission.sh/metrics" + value: "https://g.fission.io/metrics" {{- end }} readinessProbe: httpGet: