Using latest tag for image names in helm chart (#52)

* using latest tag for image names Signed-off-by: Aaron Schlesinger <[email protected]> * adding latest tag Signed-off-by: Aaron Schlesinger <[email protected]> * moving to hierarchical image configs Signed-off-by: Aaron Schlesinger <[email protected]>
kedacore · Feb 9, 2021 · 4141b75 · 4141b75
1 parent 0746514
commit 4141b75
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -60,8 +60,8 @@ helm-upgrade-operator:
     --namespace ${NAMESPACE} \
     --create-namespace \
     --set image=${OPERATOR_DOCKER_IMG} \
-	--set externalScalerImage=${SCALER_DOCKER_IMG} \
-	--set interceptorImage=${INTERCEPTOR_DOCKER_IMG}
+	--set images.scaler=${SCALER_DOCKER_IMG} \
+	--set images.interceptor=${INTERCEPTOR_DOCKER_IMG}
 
 .PHONY: helm-delete-operator
 helm-delete-operator:
@@ -94,4 +94,4 @@ helm-upgrade-keda:
 
 .PHONY: helm-delete-keda
 helm-delete-keda:
-	helm delete -n ${NAMESPACE} keda
+	helm delete -n ${NAMESPACE} keda
diff --git a/charts/keda-http-operator/templates/deployment.yaml b/charts/keda-http-operator/templates/deployment.yaml
@@ -32,14 +32,14 @@ spec:
       - args:
         - --metrics-addr=127.0.0.1:8080
         - --enable-leader-election
-        image: {{ .Values.image }}
+        image: {{ .Values.images.operator }}
         imagePullPolicy: Always
         name: manager
         env:
         - name: KEDAHTTP_OPERATOR_EXTERNAL_SCALER_IMAGE
-          value: {{ .Values.externalScalerImage }}
+          value: {{ .Values.images.scaler }}
         - name: KEDAHTTP_OPERATOR_INTERCEPTOR_IMAGE
-          value: {{ .Values.interceptorImage }}
+          value: {{ .Values.images.interceptor }}
         # resources:
         #   limits:
         #     cpu: 0.5

diff --git a/charts/keda-http-operator/values.yaml b/charts/keda-http-operator/values.yaml
@@ -1,2 +1,5 @@
 version: v0.1.0-v1alpha1
-image: arschles/keda-http-operator
+images:
+  operator: ghcr.io/kedacore/http-add-on-operator:latest
+  interceptor: ghcr.io/kedacore/http-add-on-interceptor:latest
+  scaler: ghcr.io/kedacore/http-add-on-scaler:latest
diff --git a/docs/install.md b/docs/install.md
@@ -56,8 +56,8 @@ helm upgrade kedahttp ./charts/keda-http-operator \
     --namespace ${NAMESPACE} \
     --create-namespace \
     --set image=localhost:32000/keda-http-operator \
-	--set externalScalerImage=localhost:32000/keda-http-scaler \
-	--set interceptorImage=localhost:32000/keda-http-interceptor
+	--set images.scaler=localhost:32000/keda-http-scaler \
+	--set images.interceptor=localhost:32000/keda-http-interceptor
 ```
 
 In the above command, `localhost:32000` is the address of the registry from inside a Microk8s cluster.