#2 OZG-7121 helm: Use namespace-ca-issuer

.gitlab-ci.yml

@@ -38,6 +38,9 @@ test:
 .helm:
   before_script:
     - apk add --no-cache helm git curl
+  script:
+    - helm package --version=${HELM_CHART_VERSION} src/main/helm
+    - curl -u ${NEXUS_USER}:${NEXUS_PASSWORD} https://nexus.ozg-sh.de/service/rest/v1/components?repository=${NEXUS_HELM_REPO_NAME} -F file=@${PROJECT_ARTIFACTID}-${HELM_CHART_VERSION}.tgz
 
 test-helm:
   stage: test
@@ -83,13 +86,16 @@ push-merge-request-image-nexus:
 
 push-merge-request-helm-nexus:
   stage: publish
+  variables:
+    NEXUS_HELM_REPO_NAME: ozg-base-apps-snapshot
   before_script:
     - !reference [.get-version, before_script]
     - !reference [.helm, before_script]
   script:
     - export HELM_CHART_VERSION=${PROJECT_VERSION}-MR-${CI_MERGE_REQUEST_IID}
-    - helm package --version=${HELM_CHART_VERSION} src/main/helm
-    - curl -u ${NEXUS_USER}:${NEXUS_PASSWORD} https://nexus.ozg-sh.de/service/rest/v1/components?repository=ozg-base-apps-snapshot -F file=@${PROJECT_ARTIFACTID}-${HELM_CHART_VERSION}.tgz
+    - !reference [.helm, script]
+    - export HELM_CHART_VERSION=${PROJECT_VERSION}-MR-${CI_MERGE_REQUEST_IID}-${CI_COMMIT_SHORT_SHA}
+    - !reference [.helm, script]
   rules:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
   when: manual

src/main/helm/templates/certificate.yaml

@@ -12,9 +12,8 @@ spec:
     algorithm: ECDSA
     size: 256
   issuerRef:
-    name: xta-test-cluster-issuer
-    kind: ClusterIssuer
-    group: cert-manager.io
+    name: {{ include "app.namespace" . }}-ca-issuer
+    kind: Issuer
   duration: 8760h0m0s # 1 Jahr
   renewBefore: 5840h0m0s # 8 Monate
   commonName: {{ .Release.Name }}

src/main/helm/templates/selfsigned_cluster_issuer.yaml

-apiVersion: cert-manager.io/v1
-kind: ClusterIssuer
-metadata:
-  name: xta-test-cluster-issuer
-  namespace: {{ include "app.namespace" . }}
-  labels:
-    {{- include "app.defaultLabels" . | indent 4 }}
-spec:
-  selfSigned: {}
\ No newline at end of file