Fix image values (#112)

rimusz · Aug 27, 2021 · df93393 · df93393
1 parent ae815f1
commit df93393
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 10 deletions.
diff --git a/stable/gcloud-sqlproxy/Chart.yaml b/stable/gcloud-sqlproxy/Chart.yaml
@@ -19,4 +19,4 @@ name: gcloud-sqlproxy
 sources:
 - https://github.com/rimusz/charts
 type: application
-version: 0.22.0
+version: 0.22.1
diff --git a/stable/gcloud-sqlproxy/README.md b/stable/gcloud-sqlproxy/README.md
@@ -138,6 +138,10 @@ GCP does not support more than 5 endpoints on an Internal Load Balancer. To work
 
 ## Upgrading
 
+**From < 0.22.0 to >= 0.22.1**
+
+Please note, as of `0.22.1` image `repository`, `tag` and `pullPolicy` values use new variables, if not using the defaults, you will need to rename them.
+
 **From < 0.10.0 to >= 0.10.0**
 
 Please note, if chart name is included in release name, it will now be used as full name.

diff --git a/stable/gcloud-sqlproxy/templates/deployment.yaml b/stable/gcloud-sqlproxy/templates/deployment.yaml
@@ -39,8 +39,8 @@ spec:
       {{- end }}
       containers:
       - name: sqlproxy
-        image: "{{ .Values.image }}:{{ default .Chart.AppVersion .Values.image.tag }}"
-        imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
+        image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
+        imagePullPolicy: {{ default "" .Values.image.pullPolicy | quote }}
         resources:
 {{ toYaml .Values.resources | indent 10 }}
         command:

diff --git a/stable/gcloud-sqlproxy/values.yaml b/stable/gcloud-sqlproxy/values.yaml
@@ -1,15 +1,14 @@
 ## Google Cloud SQL Proxy image
 ## ref: https://cloud.google.com/sql/docs/mysql/sql-proxy
 ## ref: https://cloud.google.com/sql/docs/postgres/sql-proxy
-image: gcr.io/cloudsql-docker/gce-proxy
+image:
+  repository: gcr.io/cloudsql-docker/gce-proxy
   # Note that by default we use appVersion to get image tag
   # tag:
-
-## Specify a imagePullPolicy
-## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
-## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
-##
-imagePullPolicy: IfNotPresent
+  ## Specify a imagePullPolicy
+  ## 'Always' if imageTag is 'latest', else set to 'IfNotPresent'
+  ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
+  pullPolicy: IfNotPresent
 
 ## Replicas Set count
 replicasCount: 1