Merge branch 'master' into OZG-6747

Jenkinsfile

@@ -53,7 +53,7 @@ tools { go 'go-1.22.0' }
             }
         }   
 
-        stage('Build Antragsraum-Proxy') {
+        stage('Build antragraum-proxy') {
             steps {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
@@ -87,17 +87,17 @@ tools { go 'go-1.22.0' }
                 script {
                     FAILED_STAGE=env.STAGE_NAME
                 
-                   sh "docker build -t docker.ozg-sh.de/antragsraum-proxy:${env.APP_VERSION} ."
+                   sh "docker build -t docker.ozg-sh.de/antragraum-proxy:${env.APP_VERSION} ."
 
                     IMAGE_TAG = generateImageTag()
 
-                    tagAndPushDockerImage('antragsraum-proxy', IMAGE_TAG)
+                    tagAndPushDockerImage('antragraum-proxy', IMAGE_TAG)
 
                     if (env.BRANCH_NAME == 'master') {
-                        tagAndPushDockerImage('antragsraum-proxy', 'snapshot-latest')
+                        tagAndPushDockerImage('antragraum-proxy', 'snapshot-latest')
                     }
                     else if (env.BRANCH_NAME == 'release') {
-                        tagAndPushDockerImage('antragsraum-proxy', 'latest')
+                        tagAndPushDockerImage('antragraum-proxy', 'latest')
                     }
                 }
             }
@@ -131,7 +131,7 @@ tools { go 'go-1.22.0' }
 
                     cloneGitopsRepo()
 
-                    setNewDevAntragsraumProxyVersion()
+                    setNewDevAntragraumProxyVersion()
 
                     pushDevGitopsRepo()
                 }
@@ -148,7 +148,7 @@ tools { go 'go-1.22.0' }
 
                     cloneGitopsRepo()
 
-                    setNewTestAntragsraumProxyVersion()
+                    setNewTestAntragraumProxyVersion()
 
                     pushTestGitopsRepo()
                 }
@@ -161,7 +161,7 @@ tools { go 'go-1.22.0' }
 
 Void deployHelmChart(String helmChartVersion) {
     withCredentials([usernamePassword(credentialsId: 'jenkins-nexus-login', usernameVariable: 'USERNAME', passwordVariable: 'PASSWORD')]){
-        String fileName = '@antragsraum-proxy-' + helmChartVersion + '.tgz'
+        String fileName = '@antragraum-proxy-' + helmChartVersion + '.tgz'
         result = sh script: '''curl -u $USERNAME:$PASSWORD https://nexus.ozg-sh.de/service/rest/v1/components?repository=''' + getHelmRepository() + ''' -F file=''' + fileName, returnStdout: true
 
         if (result != '') {
@@ -209,9 +209,9 @@ String getElementAccessToken() {
 
 String getFailureData() {
     return  """{"msgtype":"m.text", \
-                    "body":"Antragsraum-Proxy: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER}", \
+                    "body":"antragraum-proxy: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER}", \
                     "format": "org.matrix.custom.html", \
-                    "formatted_body":"Antragsraum-Proxy: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER}"}"""
+                    "formatted_body":"antragraum-proxy: Build Failed. Stage: ${FAILED_STAGE} Build-ID: ${env.BUILD_NUMBER}"}"""
 }
 
 String getRoom() {
@@ -240,22 +240,22 @@ Void cloneGitopsRepo() {
     configureGit()
 }
 
-Void setNewDevAntragsraumProxyVersion() {
-    setNewAntragsraumProxyGitopsVersion("dev")
+Void setNewDevAntragraumProxyVersion() {
+    setNewAntragraumProxyGitopsVersion("dev")
 }
 
-Void setNewTestAntragsraumProxyVersion() {
-    setNewAntragsraumProxyGitopsVersion("test")
+Void setNewTestAntragraumProxyVersion() {
+    setNewAntragraumProxyGitopsVersion("test")
 }
 
-Void setNewAntragsraumProxyGitopsVersion(String environment) {
+Void setNewAntragraumProxyGitopsVersion(String environment) {
     dir("gitops") {
         def envFile = "${environment}/application/values/antragraum-proxy-values.yaml"
 
         def envVersions = readYaml file: envFile
 
-        envVersions.antragsraum_proxy.image.tag = IMAGE_TAG
-        envVersions.antragsraum_proxy.helm.version = HELM_CHART_VERSION
+        envVersions.antragraum_proxy.image.tag = IMAGE_TAG
+        envVersions.antragraum_proxy.helm.version = HELM_CHART_VERSION
 
         writeYaml file: envFile, data: envVersions, overwrite: true
     }
@@ -272,20 +272,20 @@ Void pushTestGitopsRepo() {
 
 Void pushNewGitopsVersion(String environment) {
     dir('gitops') {
-        if (!hasAntragsraumProxyValuesFileChanged(environment)) {
+        if (!hasAntragraumProxyValuesFileChanged(environment)) {
             return
         }
 
         withCredentials([usernamePassword(credentialsId: 'jenkins-gitea-access-token', passwordVariable: 'TOKEN', usernameVariable: 'USER')]) {
             sh "git add ${environment}/application/values/antragraum-proxy-values.yaml"
 
-            sh "git commit -m 'jenkins rollout ${environment} antragsraum-proxy version ${IMAGE_TAG}'"
+            sh "git commit -m 'jenkins rollout ${environment} antragraum-proxy version ${IMAGE_TAG}'"
             sh 'git push https://${USER}:${TOKEN}@git.ozg-sh.de/ozgcloud-devops/gitops.git'
         }
     }
 }
 
-Boolean hasAntragsraumProxyValuesFileChanged(String environment) {
+Boolean hasAntragraumProxyValuesFileChanged(String environment) {
     return sh (script: "git status | grep '${environment}/application/values/antragraum-proxy-values.yaml'", returnStatus: true) == env.SH_SUCCESS_STATUS_CODE as Integer
 }
 

src/main/helm/Chart.yaml

@@ -25,6 +25,6 @@
 apiVersion: v1
 appVersion: "v1.0.0-beta.1"
 description: A Helm chart for Anragsraum-Proxy
-name: antragsraum-proxy
+name: antragraum-proxy
 version: 0.0.0-MANAGED-BY-JENKINS
 icon: https://simpleicons.org/icons/helm.svg

src/main/helm/templates/_helpers.tpl

 
 {{/* Default Labels: Helm recommended best-practice labels https://helm.sh/docs/chart_best_practices/labels/ */}}
 {{- define "app.defaultLabels" }}
-app.kubernetes.io/instance: antragsraum-proxy
+app.kubernetes.io/instance: antragraum-proxy
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/namespace: {{ .Release.Namespace }}
 app.kubernetes.io/part-of: ozgcloud
 app.kubernetes.io/version: {{ .Chart.Version }}
 helm.sh/chart: {{ printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" }}
-app.kubernetes.io/component: antragsraum-proxy
-component: antragsraum-proxy
+app.kubernetes.io/component: antragraum-proxy
+component: antragraum-proxy
 {{- end -}}
 
 {{- define "app.matchLabels" }}
 app.kubernetes.io/name: {{ .Release.Name }}
 app.kubernetes.io/namespace: {{ .Release.Namespace }}
-component: antragsraum-proxy
+component: antragraum-proxy
 {{- end -}}
 
 
 {{- define "app.serviceAccountName" -}}
-{{ printf "%s" ( (.Values.serviceAccount).name | default "antragsraum-proxy-service-account" ) }}
+{{ printf "%s" ( (.Values.serviceAccount).name | default "antragraum-proxy-service-account" ) }}
 {{- end -}}
 
 

src/main/helm/templates/deployment.yaml

@@ -72,7 +72,7 @@ spec:
 
         image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}"
         imagePullPolicy: Always
-        name: antragsraum-proxy
+        name: antragraum-proxy
         ports:
           - containerPort: 8082
             name: 8082tcp1

src/main/helm/templates/network_policy.yaml

@@ -26,12 +26,12 @@
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: network-policy-antragsraum-proxy
+  name: network-policy-antragraum-proxy
   namespace: {{ .Release.Namespace }}
 spec:
   podSelector:
     matchLabels:
-      component: antragsraum-proxy
+      component: antragraum-proxy
   policyTypes:
     - Ingress
     - Egress

src/main/helm/values.yaml

@@ -28,7 +28,7 @@ replicaCount: 1
 
 image:
   repo: docker.ozg-sh.de
-  name: antragsraum-proxy
+  name: antragraum-proxy
   tag: latest # [default: latest]
 
 

src/test/helm-linter-values.yaml

@@ -6,9 +6,9 @@ networkPolicy:
 imagePullSecret: ozgcloud-image-pull-secret
 
 ozgcloud:
-  bezeichner: antragsraum-proxy
+  bezeichner: antragraum-proxy
 
-baseUrl: antragsraum-proxy.dev.de
+baseUrl: antragraum-proxy.dev.de
 
 grpc:
   server:

src/test/helm/deployment_defaults_labels_test.yaml

@@ -24,7 +24,7 @@
 
 suite: test deployment default labels
 release:
-  name: antragsraum-proxy
+  name: antragraum-proxy
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml
@@ -39,36 +39,36 @@ tests:
       - equal:
           path: metadata.labels
           value:
-            app.kubernetes.io/instance: antragsraum-proxy
+            app.kubernetes.io/instance: antragraum-proxy
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: antragsraum-proxy
+            app.kubernetes.io/name: antragraum-proxy
             app.kubernetes.io/namespace: sh-helm-test
             app.kubernetes.io/part-of: ozgcloud
             app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
-            helm.sh/chart: antragsraum-proxy-0.0.0-MANAGED-BY-JENKINS
-            app.kubernetes.io/component: antragsraum-proxy
-            component: antragsraum-proxy
+            helm.sh/chart: antragraum-proxy-0.0.0-MANAGED-BY-JENKINS
+            app.kubernetes.io/component: antragraum-proxy
+            component: antragraum-proxy
 
   - it: should set spec.selector.matchLabels
     asserts:
       - equal:
           path: spec.selector.matchLabels
           value:
-            app.kubernetes.io/name: antragsraum-proxy
+            app.kubernetes.io/name: antragraum-proxy
             app.kubernetes.io/namespace: sh-helm-test
-            component: antragsraum-proxy
+            component: antragraum-proxy
 
   - it: should have correct deyploment spec.template.metadata.labels
     asserts:
       - equal:
           path: spec.template.metadata.labels
           value:
-            app.kubernetes.io/instance: antragsraum-proxy
+            app.kubernetes.io/instance: antragraum-proxy
             app.kubernetes.io/managed-by: Helm
-            app.kubernetes.io/name: antragsraum-proxy
+            app.kubernetes.io/name: antragraum-proxy
             app.kubernetes.io/namespace: sh-helm-test
             app.kubernetes.io/part-of: ozgcloud
             app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
-            helm.sh/chart: antragsraum-proxy-0.0.0-MANAGED-BY-JENKINS
-            app.kubernetes.io/component: antragsraum-proxy
-            component: antragsraum-proxy
+            helm.sh/chart: antragraum-proxy-0.0.0-MANAGED-BY-JENKINS
+            app.kubernetes.io/component: antragraum-proxy
+            component: antragraum-proxy

src/test/helm/deployment_imagepull_secret_test.yaml

@@ -24,7 +24,7 @@
 
 suite: test deployment image pull secret
 release:
-  name: antragsraum-proxy
+  name: antragraum-proxy
   namespace: sh-helm-test
 templates:
   - templates/deployment.yaml

src/test/helm/deployment_resources_test.yaml

@@ -24,7 +24,7 @@
 
 suite: test deployment container resources
 release:
-  name: antragsraum-proxy
+  name: antragraum-proxy
 templates:
   - templates/deployment.yaml
 set:

src/test/helm/deployment_test.yaml

@@ -24,7 +24,7 @@
 
 suite: deployment
 release:
-  name: antragsraum-proxy
+  name: antragraum-proxy
 templates:
   - templates/deployment.yaml
 set:
@@ -42,7 +42,7 @@ tests:
           of: apps/v1
       - equal:
           path: metadata.name
-          value: "antragsraum-proxy"
+          value: "antragraum-proxy"
       - equal:
           path: metadata.namespace
           value: "NAMESPACE"
@@ -63,7 +63,7 @@ tests:
           path: spec.selector
       - equal:
           path: spec.selector.matchLabels["app.kubernetes.io/name"]
-          value: "antragsraum-proxy"
+          value: "antragraum-proxy"
       - equal:
           path: spec.selector.matchLabels["app.kubernetes.io/namespace"]
           value: "NAMESPACE"
@@ -80,10 +80,10 @@ tests:
     asserts:
       - equal:
           path: spec.template.metadata.labels["app.kubernetes.io/instance"]
-          value: "antragsraum-proxy"
+          value: "antragraum-proxy"
       - equal:
           path: spec.template.metadata.labels.component
-          value: "antragsraum-proxy"
+          value: "antragraum-proxy"
       - equal:
           path: spec.template.spec.topologySpreadConstraints[0].maxSkew
           value: 1
@@ -95,7 +95,7 @@ tests:
           value: "ScheduleAnyway"
       - equal:
           path: spec.template.spec.topologySpreadConstraints[0].labelSelector.matchLabels["app.kubernetes.io/name"]
-          value: "antragsraum-proxy"
+          value: "antragraum-proxy"
       - isEmpty:
           path: spec.template.spec.dnsConfig
       - equal:
@@ -116,10 +116,10 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].name
-          value: "antragsraum-proxy"
+          value: "antragraum-proxy"
       - equal:
           path: spec.template.spec.containers[0].image
-          value: "docker.ozg-sh.de/antragsraum-proxy:latest"
+          value: "docker.ozg-sh.de/antragraum-proxy:latest"
       - equal:
           path: spec.template.spec.containers[0].imagePullPolicy
           value: "Always"

src/test/helm/ingress_tests.yaml

@@ -24,7 +24,7 @@
 
 suite: test ingress.yaml
 release:
-  name: antragsraum-proxy
+  name: antragraum-proxy
   namespace: sh-helm-test
 templates:
   - templates/ingress.yaml
@@ -42,7 +42,7 @@ tests:
     asserts:
       - equal:
           path: spec.tls[0].secretName
-          value: helm-antragsraum-proxy-tls
+          value: helm-antragraum-proxy-tls
   
   - it: should use default letsencrypt-prod cluster-issuer
     asserts:
@@ -81,7 +81,7 @@ tests:
               pathType: Prefix
               backend:
                 service:
-                  name: antragsraum-proxy
+                  name: antragraum-proxy
                   port: 
                     number: 8082
 

src/test/helm/network_policy_test.yaml

@@ -54,7 +54,7 @@ tests:
       - equal:
           path: metadata
           value:
-            name: network-policy-antragsraum-proxy
+            name: network-policy-antragraum-proxy
             namespace: by-helm-test
 
   - it: should generate spec
@@ -92,7 +92,7 @@ tests:
                   - port: 8082
             podSelector:
               matchLabels:
-                component: antragsraum-proxy
+                component: antragraum-proxy
             policyTypes:
               - Ingress
               - Egress

src/test/helm/service_test.yaml

@@ -24,7 +24,7 @@
 
 suite: test service
 release:
-  name: antragsraum-proxy
+  name: antragraum-proxy
   namespace: sh-helm-test
 templates:
   - templates/service.yaml
@@ -37,7 +37,7 @@ tests:
           of: v1
       - equal:
           path: metadata.labels.component
-          value: antragsraum-proxy
+          value: antragraum-proxy
   - it: should be of type ClusterIP
     asserts:
       - equal:
@@ -59,19 +59,19 @@ tests:
     asserts:
       - equal:
           path: spec.selector.component
-          value: antragsraum-proxy
+          value: antragraum-proxy
 
   - it: selector should contain helm recommended labels name and namespace
     asserts:
       - equal:
           path: spec.selector
           value:
-            app.kubernetes.io/name: antragsraum-proxy
+            app.kubernetes.io/name: antragraum-proxy
             app.kubernetes.io/namespace: sh-helm-test
-            component: antragsraum-proxy
+            component: antragraum-proxy
 
   - it: check component label for service
     asserts:
       - equal:
           path: metadata.labels["component"]
-          value: antragsraum-proxy
+          value: antragraum-proxy
\ No newline at end of file