common: update to 0.2.0

* Changed 'repository' to 'repositorySetting' in 'image' * Changed 'name' to 'repository' in 'image'
RubxKube · Jul 2, 2023 · 62f6a65 · 62f6a65
1 parent 693a826
commit 62f6a65
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git a/charts/common/Chart.yaml b/charts/common/Chart.yaml
@@ -5,7 +5,7 @@ maintainers:
  - name: QJOLY
    email: [email protected]
 name: common
-version: v0.1.0
+version: v0.2.0
 appVersion: "0"
 kubeVersion: ">= 1.18"
 home: https://github.com/RubxKube/common-charts

diff --git a/charts/common/templates/deployment.yaml b/charts/common/templates/deployment.yaml
@@ -22,18 +22,14 @@ spec:
       labels:
         app: {{ .Release.Name }}
     spec:
-      {{- if .Values.image.repository.isPrivate }}
+      {{- if .Values.image.repositorySettings.isPrivate }}
       imagePullSecrets:
-        - name: "{{ .Values.image.repository.secretName }}"
+        - name: "{{ .Values.image.repositorySettings.secretName }}"
       {{- end }}
       containers:
         - name: {{ .Release.Name }}
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          {{- if .Values.image.repository.name }}
-          image: "{{ .Values.image.repository.name }}/{{ .Values.image.name }}:{{ .Values.image.tag }}"
-          {{- else }}
-          image: "{{ .Values.image.name }}:{{ .Values.image.tag }}"
-          {{- end }}
+          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           ports:
           - containerPort: {{ .Values.app.containerPort }}
           resources:

diff --git a/charts/common/values.yaml b/charts/common/values.yaml
@@ -20,11 +20,10 @@ deployment:
 
 # container
 image:
-  repository:
-    name: null
+  repositorySettings:
     isPrivate: false
     secretName: null
-  name: nginx
+  repository: nginx
   tag: latest
   pullPolicy: Always