fix: case of custom artifact repository

Signed-off-by: tomoki-yamaguchi <toyamagu2021@gmail.com>

charts/argo-workflows/ci/enable-artifact-repo-s3-values.yaml

@@ -1,22 +0,0 @@
-# Test with artifact repository(s3)
-crds:
-  keep: false
-
-useStaticCredentials: true
-artifactRepository:
-  archiveLogs: false
-  s3:
-    accessKeySecret:
-      name: "{{ .Release.Name }}-minio"
-      key: accesskey
-    secretKeySecret:
-      name: "{{ .Release.Name }}-minio"
-      key: secretkey
-    insecure: false
-    bucket:
-    endpoint:
-    region:
-    roleARN:
-    useSDKCreds: true
-    encryptionOptions:
-      enableEncryption: true

charts/argo-workflows/ci/enable-artifact-repo-values.yaml

@@ -1,4 +1,4 @@
-# Test with artifact repository(azure, gcp. s3 will be ignored.)
+# Test with artifact repository
 crds:
   keep: false
 
@@ -34,3 +34,13 @@ artifactRepository:
     accountKeySecret:
       name: my-azure-storage-credentials
       key: account-access-key
+
+customArtifactRepository:
+  artifactory:
+    repoUrl: https://artifactory.example.com/raw
+    usernameSecret:
+      name: artifactory-creds
+      key: username
+    passwordSecret:
+      name: artifactory-creds
+      key: password

charts/argo-workflows/templates/controller/workflow-controller-config-map.yaml

@@ -55,7 +55,7 @@ data:
       securityContext: {{- toYaml . | nindent 8 }}
       {{- end }}
     {{- end }}
-    {{- if or .Values.artifactRepository.gcs .Values.artifactRepository.azure .Values.artifactRepository.s3 }}
+    {{- if or .Values.artifactRepository.s3 .Values.artifactRepository.gcs .Values.artifactRepository.azure .Values.customArtifactRepository }}
     artifactRepository:
       {{- if .Values.artifactRepository.archiveLogs }}
       archiveLogs: {{ .Values.artifactRepository.archiveLogs }}
@@ -66,7 +66,7 @@ data:
       {{- with .Values.artifactRepository.azure }}
       azure: {{- tpl (toYaml .) $ | nindent 8 }}
       {{- end }}
-      {{- if and  (not .Values.artifactRepository.gcs) (not .Values.artifactRepository.azure) }}
+      {{- if .Values.artifactRepository.s3 }}
       s3:
         {{- if .Values.useStaticCredentials }}
         accessKeySecret:
@@ -96,9 +96,9 @@ data:
           {{- toYaml . | nindent 10 }}
         {{- end }}
       {{- end }}
-    {{- end }}
-    {{- if .Values.customArtifactRepository }}
-    {{- toYaml .Values.customArtifactRepository | nindent 6 }}
+      {{- if .Values.customArtifactRepository }}
+      {{- toYaml .Values.customArtifactRepository | nindent 6 }}
+      {{- end }}
     {{- end }}
     {{- if .Values.controller.metricsConfig.enabled }}
     metricsConfig: