Bläddra i källkod

remove additinal_attrs and move logsearch image in its own dict

Stavros Kois 2 år sedan
förälder
incheckning
aeb9c3ca7a

+ 4 - 4
test/minio/1.7.0/ix_values.yaml

@@ -2,12 +2,12 @@ image:
   pullPolicy: IfNotPresent
   repository: minio/minio
   tag: RELEASE.2022-11-10T18-20-21Z
+logSearchImage:
+  pullPolicy: IfNotPresent
+  repository: minio/operator
+  tag: v4.5.4
 logsearchapi:
   enabled: false
   diskCapacityGB: 5
-  image:
-    pullPolicy: IfNotPresent
-    repository: minio/operator
-    tag: v4.5.4
 runAsGroup: 473
 runAsUser: 473

+ 0 - 1
test/minio/1.7.0/questions.yaml

@@ -190,7 +190,6 @@ questions:
     group: Minio Configuration
     schema:
       type: dict
-      additional_attrs: true
       attrs:
         - variable: enabled
           label: Enable Log Search API

+ 1 - 1
test/minio/1.7.0/templates/_logsearchapi.tpl

@@ -1,5 +1,5 @@
 {{- define "logsearchapi.imageName" -}}
-{{- print "minio/operator:v4.5.3" -}}
+{{- printf "%s:%s" .Values.logSearchImage.repository .Values.logSearchImage.tag -}}
 {{- end -}}
 
 {{- define "logsearchapi.nameSuffix" -}}

+ 1 - 1
test/minio/1.7.0/templates/logsearchapi-deployment.yaml

@@ -19,7 +19,7 @@ spec: {{ include "common.deployment.common_spec" $values | nindent 2 }}
       containers:
         - name: {{ .Chart.Name }}-{{ include "logsearchapi.nameSuffix" . }}
           image: {{ include "logsearchapi.imageName" . }}
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
+          imagePullPolicy: {{ .Values.logSearchImage.pullPolicy }}
           env: {{ include "logsearchapi.envVariableConfiguration" $values | nindent 10 }}
           command:
             - {{ include "logsearchapi.command" . }}