#4 apply suggestions from review

cloudogu · Sep 28, 2023 · 4dfea7c · 4dfea7c
1 parent dcf16c5
commit 4dfea7c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -237,19 +237,15 @@ void stageAutomaticRelease(Makefile makefile) {
                     .mountJenkinsUser()
                     .inside("--volume ${WORKSPACE}:/go/src/${project} -w /go/src/${project}")
                             {
-                                // Package & Push operator-chart
+                                // Package operator-chart & crd-chart
                                 make 'helm-package-release'
-
-                                withCredentials([usernamePassword(credentialsId: 'harborhelmchartpush', usernameVariable: 'HARBOR_USERNAME', passwordVariable: 'HARBOR_PASSWORD')]) {
-                                    sh ".bin/helm registry login ${registry} --username '${HARBOR_USERNAME}' --password '${HARBOR_PASSWORD}'"
-                                    sh ".bin/helm push target/helm/${repositoryName}-${controllerVersion}.tgz oci://${registry}/${registry_namespace}/"
-                                }
-
-                                // Package & Push crd-chart
                                 make 'crd-helm-package'
 
+                                // Push charts
                                 withCredentials([usernamePassword(credentialsId: 'harborhelmchartpush', usernameVariable: 'HARBOR_USERNAME', passwordVariable: 'HARBOR_PASSWORD')]) {
                                     sh ".bin/helm registry login ${registry} --username '${HARBOR_USERNAME}' --password '${HARBOR_PASSWORD}'"
+
+                                    sh ".bin/helm push target/helm/${repositoryName}-${controllerVersion}.tgz oci://${registry}/${registry_namespace}/"
                                     sh ".bin/helm push target/helm-crd/${repositoryName}-crd-${controllerVersion}.tgz oci://${registry}/${registry_namespace}/"
                                 }
                             }

diff --git a/k8s/helm/Chart.yaml b/k8s/helm/Chart.yaml
@@ -24,6 +24,6 @@ version: 0.0.0-replaceme
 appVersion: "0.0.0-replaceme"
 
 annotations:
-  # Dependency for the Dogu-CRD.
+  # Dependency for the Backup-CRDs.
   # Allow all versions up to next major version to avoid breaking changes
   "k8s.cloudogu.com/ces-dependency/k8s-backup-operator-crd": "0.x"