diff --git a/src/main/helm/Chart.yaml b/src/main/helm/Chart.yaml index 100569390927ca2cff60374416f14e6da4bb90c8..3a0fe255cb0ed9a837d76d16eafc318dd76bd2fc 100644 --- a/src/main/helm/Chart.yaml +++ b/src/main/helm/Chart.yaml @@ -24,7 +24,7 @@ apiVersion: v1 appVersion: "1.0" -description: A Helm chart for Pluto -name: pluto +description: A Helm chart for Vorgangmanager +name: vorgang-manager version: 0.0.0-MANAGED-BY-JENKINS icon: https://simpleicons.org/icons/helm.svg diff --git a/src/main/helm/app-readme.md b/src/main/helm/app-readme.md index 5bb01403f550f2f14e7c49d504f79c6a1fb616de..d2c6f0ab2bbc47e5cae9d23c5f58a4cadbe4b3e5 100644 --- a/src/main/helm/app-readme.md +++ b/src/main/helm/app-readme.md @@ -1,4 +1,4 @@ -# Vorgang Manager +# Vorgangmanager Das helm chart zur Installation des Vorgangsmanagers. @@ -28,7 +28,9 @@ env: ### Nutzen einer externen MongoDB -Möchte man Vorgang Manager mit einer externen MongoDB verbinden, so muss unter `Datenbank` die `Nutze externe Datenbank` Checkbox gesetzt sein und im Namespace muss sich ein Opaque Secret mit Namen `pluto-database-spring` befinden. +Möchte man Vorgangmanager mit einer externen MongoDB verbinden, so muss unter `Datenbank` die +`Nutze externe Datenbank` Checkbox gesetzt sein und im Namespace muss sich ein Opaque Secret mit +Namen `vorgang-manager-database-spring` befinden. In dem Secret müssen folgende Felder vorhanden sein. diff --git a/src/main/helm/questions.yml b/src/main/helm/questions.yml index b585979145df477ed27ef9c4ac6064a2ca9a75d1..4195b20d9fcb42ca32d9b88a46ce75d6a0e9c866 100644 --- a/src/main/helm/questions.yml +++ b/src/main/helm/questions.yml @@ -38,9 +38,9 @@ questions: group: "Container" type: string label: "Override Spring boot profile" - # --- KOP --- - - variable: kop.environment - group: "KOP" + # --- OZGCLOUD --- + - variable: ozgcloud.environment + group: "OZGCLOUD" label: "Environment" type: string required: true @@ -75,31 +75,31 @@ questions: label: MountPath required: true # --- OSI Postfach --- - - variable: kopProxyApi.apikey + - variable: ozgcloudProxyApi.apikey group: "OSI Postfach" type: string label: API Key required: false - - variable: kopProxyApi.url + - variable: ozgcloudProxyApi.url group: "OSI Postfach" type: string label: URL required: false - - variable: kopProxyApi.realm + - variable: ozgcloudProxyApi.realm group: "OSI Postfach" label: Realm type: string required: false - - variable: kopProxyApi.scheduler.enabled + - variable: ozgcloudProxyApi.scheduler.enabled group: "OSI Postfach" label: Enable Postfach scheduler type: boolean required: true - - variable: kopProxyApi.scheduler.fixedDelay + - variable: ozgcloudProxyApi.scheduler.fixedDelay group: "OSI Postfach" label: Fixed Delay type: int - show_if: kopProxyApi.scheduler.enabled + show_if: ozgcloudProxyApi.scheduler.enabled - variable: osipostfach.httpproxy.enabled type: boolean default: true diff --git a/src/main/helm/templates/_helpers.tpl b/src/main/helm/templates/_helpers.tpl index a6f2595f66fe14c0d6ebee45687c83909dadc42e..dc8f0d82005fe7abf4ec651c1321893b9e806d9d 100644 --- a/src/main/helm/templates/_helpers.tpl +++ b/src/main/helm/templates/_helpers.tpl @@ -28,11 +28,11 @@ {{/* Default Labels: Helm recommended best-practice labels https://helm.sh/docs/chart_best_practices/labels/ */}} {{- define "app.defaultLabels" }} -app.kubernetes.io/instance: pluto +app.kubernetes.io/instance: vorgang-manager app.kubernetes.io/managed-by: {{ include "app.managedBy" . }} app.kubernetes.io/name: {{ include "app.name" . }} app.kubernetes.io/namespace: {{ include "app.namespace" . }} -app.kubernetes.io/part-of: kop +app.kubernetes.io/part-of: ozgcloud app.kubernetes.io/version: {{ include "app.version" . }} helm.sh/chart: {{ include "app.chart" . }} {{- end -}} @@ -52,19 +52,19 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} {{- if (.Values.env).overrideSpringProfiles -}} {{ printf "%s" (.Values.env).overrideSpringProfiles }} {{- else -}} -{{ printf "oc, %s" (include "app.kopEnvironment" . ) }} +{{ printf "oc, %s" (include "app.ozgcloudEnvironment" . ) }} {{- end -}} {{- end -}} -{{- define "app.kopEnvironment" -}} -{{- required "Environment muss angegeben sein" (.Values.kop).environment -}} +{{- define "app.ozgcloudEnvironment" -}} +{{- required "Environment muss angegeben sein" (.Values.ozgcloud).environment -}} {{- end -}} -{{- define "app.plutoDatabase" -}} +{{- define "app.vorgangmanagerDatabase" -}} {{- if (.Values.database).databaseName -}} {{ .Values.database.databaseName }} {{- else -}} -{{ printf "pluto-database" }} +{{ printf "vorgang-manager-database" }} {{- end -}} {{- end -}} @@ -72,11 +72,11 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} {{ printf "%s.%s:9000" .Values.usermanagerName .Release.Namespace }} {{- end -}} -{{- define "app.kop_migration_user-manager_address" -}} +{{- define "app.ozgcloud_migration_user-manager_address" -}} {{ printf "http://%s.%s:8080/migration/user" .Values.usermanagerName .Release.Namespace }} {{- end -}} -{{- define "app.kop_vorgangmanager_address" -}} +{{- define "app.ozgcloud_vorgangmanager_address" -}} {{ printf "dns://%s.%s:9090" .Values.vorgangmanagerName .Release.Namespace }} {{- end -}} @@ -96,6 +96,6 @@ app.kubernetes.io/namespace: {{ include "app.namespace" . }} {{- if (.Values.database).secretName -}} {{ .Values.database.secretName }} {{- else -}} -{{ printf "ozg-mongodb-admin-pluto-user" }} +{{ printf "ozg-mongodb-admin-vorgang-manager-user" }} {{- end -}} {{- end -}} \ No newline at end of file diff --git a/src/main/helm/templates/deployment.yaml b/src/main/helm/templates/deployment.yaml index 210dad9a0054ff4eb181ff8d38385b6c1241b492..321f2318ed7d0b909c10a319bf1911d905462c5a 100644 --- a/src/main/helm/templates/deployment.yaml +++ b/src/main/helm/templates/deployment.yaml @@ -45,7 +45,7 @@ spec: metadata: labels: {{- include "app.defaultLabels" . | indent 8 }} - component: pluto + component: vorgang-manager spec: topologySpreadConstraints: - maxSkew: 1 @@ -62,31 +62,31 @@ spec: value: {{ include "app.envSpringProfiles" . }} {{- if .Values.env.aktenzeichen.enabled }} - name: aktenzeichen - value: {{ .Values.env.aktenzeichen.value | default "de.itvsh.ozg.pluto.vorgang.AktenzeichenProviderEA" }} + value: {{ .Values.env.aktenzeichen.value | default "de.ozgcloud.vorgang.vorgang.AktenzeichenProviderEA" }} {{- end }} - {{- if (.Values.kopProxyApi).url }} - - name: kop_osi_postfach_proxyapi_url - value: {{ .Values.kopProxyApi.url }} + {{- if (.Values.ozgcloudProxyApi).url }} + - name: ozgcloud_osi_postfach_proxyapi_url + value: {{ .Values.ozgcloudProxyApi.url }} {{- end }} - {{- if (.Values.kopProxyApi).realm }} - - name: kop_osi_postfach_proxyapi_realm - value: {{ .Values.kopProxyApi.realm }} + {{- if (.Values.ozgcloudProxyApi).realm }} + - name: ozgcloud_osi_postfach_proxyapi_realm + value: {{ .Values.ozgcloudProxyApi.realm }} {{- end }} - - name: kop_osi_postfach_scheduler_enabled - value: "{{ ((.Values.kopProxyApi).scheduler).enabled | default false }}" - - name: kop_osi_postfach_scheduler_fixedDelay - value: "{{ ((.Values.kopProxyApi).scheduler).fixedDelay | default 300000 }}" + - name: ozgcloud_osi_postfach_scheduler_enabled + value: "{{ ((.Values.ozgcloudProxyApi).scheduler).enabled | default false }}" + - name: ozgcloud_osi_postfach_scheduler_fixedDelay + value: "{{ ((.Values.ozgcloudProxyApi).scheduler).fixedDelay | default 300000 }}" {{- if ((.Values.osipostfach).httpproxy).enabled }} - - name: kop_osi_postfach_http-proxy_host + - name: ozgcloud_osi_postfach_http-proxy_host value: {{ .Values.osipostfach.httpproxy.host }} - - name: kop_osi_postfach_http-proxy_port + - name: ozgcloud_osi_postfach_http-proxy_port value: "{{ .Values.osipostfach.httpproxy.port }}" - - name: kop_osi_postfach_http-proxy_authenticationRequired + - name: ozgcloud_osi_postfach_http-proxy_authenticationRequired value: "{{ .Values.osipostfach.httpproxy.auth.required }}" {{- if .Values.osipostfach.httpproxy.auth.required }} - - name: kop_osi_postfach_http-proxy_username + - name: ozgcloud_osi_postfach_http-proxy_username value: {{ .Values.osipostfach.httpproxy.auth.username }} - - name: kop_osi_postfach_http-proxy_password + - name: ozgcloud_osi_postfach_http-proxy_password value: {{ .Values.osipostfach.httpproxy.auth.password }} {{- end }} {{- end }} @@ -137,9 +137,9 @@ spec: {{- end }} - name: grpc_client_user-manager_address value: {{ include "app.grpc_client_user-manager_address" . }} - - name: kop_usermanager_url - value: {{ include "app.kop_migration_user-manager_address" . }} - - name: kop_zufimanager_address + - name: ozgcloud_usermanager_url + value: {{ include "app.ozgcloud_migration_user-manager_address" . }} + - name: ozgcloud_zufimanager_address value: {{ .Values.zufimanager.address }} {{- if not (.Values.database).useExternal }} - name: spring_data_mongodb_uri @@ -149,7 +149,7 @@ spec: key: connectionString.standardSrv optional: false - name: spring_data_mongodb_database - value: {{ include "app.plutoDatabase" . }} + value: {{ include "app.vorgangmanagerDatabase" . }} {{- end }} {{- if .Values.ozgcloud.bayernid.server }} - name: ozgcloud_bayernid_server @@ -207,20 +207,20 @@ spec: {{- end}} {{- end }} {{- end}} - {{- if or (.Values.database).useExternal (.Values.kopProxyApi).apikey }} + {{- if or (.Values.database).useExternal (.Values.ozgcloudProxyApi).apikey }} envFrom: {{- if (.Values.database).useExternal }} - secretRef: - name: pluto-database-spring + name: vorgang-manager-database-spring {{- end }} - {{- if (.Values.kopProxyApi).apikey }} + {{- if (.Values.ozgcloudProxyApi).apikey }} - secretRef: - name: pluto-kop-proxyapi + name: vorgang-manager-ozgcloud-proxyapi {{- end }} {{- end }} image: "{{ .Values.image.repo }}/{{ .Values.image.name }}:{{ coalesce (.Values.image).tag "latest" }}" imagePullPolicy: Always - name: pluto + name: vorgang-manager ports: - containerPort: 9090 name: grpc-9090 @@ -311,7 +311,7 @@ spec: dnsConfig: {} dnsPolicy: ClusterFirst imagePullSecrets: - - name: pluto-image-pull-secret + - name: vorgang-manager-image-pull-secret restartPolicy: Always schedulerName: default-scheduler securityContext: {} diff --git a/src/main/helm/templates/image-pull-secret.yaml b/src/main/helm/templates/image-pull-secret.yaml index 1ca05a38277a8a316bc7e1bada8c2133d49c91db..ef8a68cd81a41d6727461e16dafe641284c0dc6b 100644 --- a/src/main/helm/templates/image-pull-secret.yaml +++ b/src/main/helm/templates/image-pull-secret.yaml @@ -25,7 +25,7 @@ apiVersion: v1 kind: Secret metadata: - name: pluto-image-pull-secret + name: vorgang-manager-image-pull-secret namespace: {{ include "app.namespace" . }} type: kubernetes.io/dockerconfigjson data: diff --git a/src/main/helm/templates/network_policy.yaml b/src/main/helm/templates/network_policy.yaml index 4bcf676dfa83cc8da4cfbfad4b3c615273b09070..d6974b1b01a55b812188edec36e3cae16a8fd42c 100644 --- a/src/main/helm/templates/network_policy.yaml +++ b/src/main/helm/templates/network_policy.yaml @@ -26,12 +26,12 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: network-policy-pluto + name: network-policy-vorgang-manager namespace: {{ .Release.Namespace }} spec: podSelector: matchLabels: - component: pluto + component: vorgang-manager policyTypes: - Ingress - Egress diff --git a/src/main/helm/templates/secret_kop_proxyapi.yaml b/src/main/helm/templates/secret_kop_proxyapi.yaml index 48bb089d5969a03e8f3c0e4143e57f9374c649e1..5ecef10ffaa1eec73aa6047dd77c03e8e2e7abac 100644 --- a/src/main/helm/templates/secret_kop_proxyapi.yaml +++ b/src/main/helm/templates/secret_kop_proxyapi.yaml @@ -22,13 +22,13 @@ # unter der Lizenz sind dem Lizenztext zu entnehmen. # -{{- if (.Values.kopProxyApi).apikey }} +{{- if (.Values.ozgcloudProxyApi).apikey }} apiVersion: v1 kind: Secret metadata: - name: pluto-kop-proxyapi + name: vorgang-manager-ozgcloud-proxyapi namespace: {{ .Release.Namespace }} type: Opaque data: - kop_osi_postfach_proxyapi_key: {{ (.Values.kopProxyApi).apikey | b64enc }} + ozgcloud_osi_postfach_proxyapi_key: {{ (.Values.ozgcloudProxyApi).apikey | b64enc }} {{- end }} \ No newline at end of file diff --git a/src/main/helm/templates/service.yaml b/src/main/helm/templates/service.yaml index 3bf8a428b4f0b69b34c0fae99fa0837e2de2a039..ff7b6c7e715fd40531f147707c9dc284054a42d7 100644 --- a/src/main/helm/templates/service.yaml +++ b/src/main/helm/templates/service.yaml @@ -29,7 +29,7 @@ metadata: namespace: {{ include "app.namespace" . }} labels: {{- include "app.defaultLabels" . | indent 4 }} - component: pluto-service + component: vorgang-manager-service spec: type: ClusterIP ports: @@ -41,4 +41,4 @@ spec: protocol: TCP selector: {{- include "app.matchLabels" . | indent 4 }} - component: pluto + component: vorgang-manager diff --git a/src/main/helm/templates/service_monitor.yaml b/src/main/helm/templates/service_monitor.yaml index 659871dc2d6a9d1a1bb4c034a2c9d8e517ce898f..22bc21ff9891ce9615c93165513af5f156e1bbca 100644 --- a/src/main/helm/templates/service_monitor.yaml +++ b/src/main/helm/templates/service_monitor.yaml @@ -29,7 +29,7 @@ metadata: namespace: {{ include "app.namespace" . }} labels: {{- include "app.defaultLabels" . | indent 4 }} - component: pluto-service-monitor + component: vorgang-manager-service-monitor spec: endpoints: - port: metrics @@ -40,4 +40,4 @@ spec: selector: matchLabels: {{- include "app.matchLabels" . | indent 6 }} - component: pluto-service \ No newline at end of file + component: vorgang-manager-service \ No newline at end of file diff --git a/src/main/helm/test-values.yaml b/src/main/helm/test-values.yaml index d30eace6d637c22a86925353bc841792f97da9e3..80e6eb95225bf8c52f5765f34fce952e6818d9ae 100644 --- a/src/main/helm/test-values.yaml +++ b/src/main/helm/test-values.yaml @@ -22,7 +22,7 @@ # unter der Lizenz sind dem Lizenztext zu entnehmen. # -kop: +ozgcloud: environment: test bezeichner: helm bundesland: sh diff --git a/src/main/helm/values.yaml b/src/main/helm/values.yaml index 493c69ec2fb981dae4b3ecd61c6f3a330da9078d..e7d59c8ce8249cd8319c543ce5050275139b0e37 100644 --- a/src/main/helm/values.yaml +++ b/src/main/helm/values.yaml @@ -28,19 +28,19 @@ baseUrl: test.sh.ozg-cloud.de replicaCount: 2 -# kop: +# ozgcloud: # environment: dev image: repo: docker.ozg-sh.de - name: pluto + name: vorgang-manager tag: latest # [default: latest] env: # overrideSpringProfiles: "oc,prod" aktenzeichen: enabled: false # [default: false] - value: de.itvsh.ozg.pluto.vorgang.AktenzeichenProviderEA + value: de.ozgcloud.vorgang.vorgang.AktenzeichenProviderEA # customList: # add name value pair for additional environments # - name: Dinge # value: true @@ -50,15 +50,15 @@ env: # database: sh-kiel-dev # host: mongodb.sh-land # password: sk9t2dfsadf20@. -# username: sh-kiel-pluto-dev +# username: sh-kiel-vorgang-manager-dev imageCredentials: registry: docker.ozg-sh.de - username: kop + username: ozgcloud password: Ymtbek3BWR8v email: webmaster@ozg-sh.de -vorgangmanagerName: pluto +vorgangmanagerName: vorgang-manager usermanagerName: user-manager diff --git a/src/test/helm/configmap_bindings_type_test.yaml b/src/test/helm/configmap_bindings_type_test.yaml index f977b825d9ccecc305eda8b1ae944cb3d31b42be..78236b32067b019da7497306962f0fd74d7d9307 100644 --- a/src/test/helm/configmap_bindings_type_test.yaml +++ b/src/test/helm/configmap_bindings_type_test.yaml @@ -24,7 +24,7 @@ suite: Certificate ConfigMap Binding release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/configmap_bindings_type.yaml diff --git a/src/test/helm/deployment_bayernid_test.yaml b/src/test/helm/deployment_bayernid_test.yaml index b60dadb9f4cb5a4d481972c2fe25165a1a0e7699..d1a802f1452620cffc9ed3b20cb7d858dd35ce82 100644 --- a/src/test/helm/deployment_bayernid_test.yaml +++ b/src/test/helm/deployment_bayernid_test.yaml @@ -24,7 +24,7 @@ suite: deployment bayernid release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/deployment.yaml diff --git a/src/test/helm/deployment_bindings_test.yaml b/src/test/helm/deployment_bindings_test.yaml index b180acc5cf66000eac64cb229f644e70677d11a8..cbc945dcb31474737a38ca52f6acb3ac485e10cd 100644 --- a/src/test/helm/deployment_bindings_test.yaml +++ b/src/test/helm/deployment_bindings_test.yaml @@ -24,7 +24,7 @@ suite: deployment user-manager bindings release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/deployment.yaml diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml index 8654e0340231eaf10a2a50609cca3f07e3129ef4..370f429f4b26bca6e87f89398b1d71c4051eca16 100644 --- a/src/test/helm/deployment_defaults_labels_test.yaml +++ b/src/test/helm/deployment_defaults_labels_test.yaml @@ -24,7 +24,7 @@ suite: test deployment release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/deployment.yaml @@ -35,13 +35,13 @@ tests: asserts: - equal: path: metadata.labels.[app.kubernetes.io/instance] - value: pluto + value: vorgang-manager - equal: path: metadata.labels.[app.kubernetes.io/name] - value: pluto + value: vorgang-manager - equal: path: metadata.labels.[app.kubernetes.io/part-of] - value: kop + value: ozgcloud - equal: path: metadata.labels.[app.kubernetes.io/namespace] value: sh-helm-test @@ -51,18 +51,18 @@ tests: asserts: - equal: path: spec.template.metadata.labels.[component] - value: pluto + value: vorgang-manager - it: check component label for service templates: - templates/service.yaml asserts: - equal: path: metadata.labels.[component] - value: pluto-service + value: vorgang-manager-service - it: check component label for service monitor templates: - templates/service_monitor.yaml asserts: - equal: path: metadata.labels.[component] - value: pluto-service-monitor \ No newline at end of file + value: vorgang-manager-service-monitor \ No newline at end of file diff --git a/src/test/helm/deployment_grpc_user-manager_address_test.yaml b/src/test/helm/deployment_grpc_user-manager_address_test.yaml index bb9bfad80c7f6e2bab23a66a528ac03ccf0743b5..b8c6f49675227d4a00f3c0d54b18b47658ca4002 100644 --- a/src/test/helm/deployment_grpc_user-manager_address_test.yaml +++ b/src/test/helm/deployment_grpc_user-manager_address_test.yaml @@ -24,7 +24,7 @@ suite: test user-manager address release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/deployment.yaml diff --git a/src/test/helm/deployment_mongodb_test.yaml b/src/test/helm/deployment_mongodb_test.yaml index 11e36cf81a16bb4466f7caac875b1352124f6757..6827e0d31c24d83ed5dc4a049ab228da5f61faeb 100644 --- a/src/test/helm/deployment_mongodb_test.yaml +++ b/src/test/helm/deployment_mongodb_test.yaml @@ -29,7 +29,7 @@ tests: - it: check mongodb default env template: deployment.yaml release: - name: pluto + name: vorgang-manager asserts: - contains: path: spec.template.spec.containers[0].env @@ -37,14 +37,14 @@ tests: name: spring_data_mongodb_uri valueFrom: secretKeyRef: - name: ozg-mongodb-admin-pluto-user + name: ozg-mongodb-admin-vorgang-manager-user key: connectionString.standardSrv optional: false - contains: path: spec.template.spec.containers[0].env content: name: spring_data_mongodb_database - value: pluto-database + value: vorgang-manager-database - contains: path: spec.template.spec.volumes content: @@ -56,7 +56,7 @@ tests: - it: check external mongodb template: deployment.yaml release: - name: pluto + name: vorgang-manager set: database.useExternal: true asserts: @@ -66,7 +66,7 @@ tests: name: spring_data_mongodb_uri valueFrom: secretKeyRef: - name: pluto-database-admin-pluto-database-user + name: vorgang-manager-database-admin-vorgang-manager-database-user key: connectionString.standardSrv optional: false - isEmpty: @@ -75,14 +75,14 @@ tests: path: spec.template.spec.containers[0].envFrom content: secretRef: - name: pluto-database-spring + name: vorgang-manager-database-spring - it: check mongodb set secretname template: deployment.yaml release: - name: pluto + name: vorgang-manager set: - database.secretName: secret-database-admin-pluto-user + database.secretName: secret-database-admin-vorgang-manager-user asserts: - contains: path: spec.template.spec.containers[0].env @@ -90,19 +90,19 @@ tests: name: spring_data_mongodb_uri valueFrom: secretKeyRef: - name: secret-database-admin-pluto-user + name: secret-database-admin-vorgang-manager-user key: connectionString.standardSrv optional: false - contains: path: spec.template.spec.containers[0].env content: name: spring_data_mongodb_database - value: pluto-database + value: vorgang-manager-database - it: check mongodb root ca mount template: deployment.yaml release: - name: pluto + name: vorgang-manager asserts: - contains: path: spec.template.spec.containers[0].volumeMounts @@ -122,7 +122,7 @@ tests: - it: check mongodb tls set tls cert name template: deployment.yaml release: - name: pluto + name: vorgang-manager set: database: tls: diff --git a/src/test/helm/deployment_resources_test.yaml b/src/test/helm/deployment_resources_test.yaml index b7909ce7a12146d10427da819c818a6fb4d3383a..17db33d4434e95ba0af410c556a5b951ebd941f7 100644 --- a/src/test/helm/deployment_resources_test.yaml +++ b/src/test/helm/deployment_resources_test.yaml @@ -24,7 +24,7 @@ suite: test deployment release: - name: pluto + name: vorgang-manager templates: - templates/deployment.yaml tests: diff --git a/src/test/helm/deployment_springProfile_test.yaml b/src/test/helm/deployment_springProfile_test.yaml index 09ef84f6062a6633f454f4a04ce9afa5eb601438..2f572212ce638f0f40e58aa5ec0a620c83e6a014 100644 --- a/src/test/helm/deployment_springProfile_test.yaml +++ b/src/test/helm/deployment_springProfile_test.yaml @@ -24,7 +24,7 @@ suite: test spring profiles release: - name: pluto + name: vorgang-manager templates: - templates/deployment.yaml tests: diff --git a/src/test/helm/deployment_test.yaml b/src/test/helm/deployment_test.yaml index d9604b2ae3fb5195884a31ffe5df8c2849ae05c0..8ce83aa463838add7277837d8365f0e8736feb9f 100644 --- a/src/test/helm/deployment_test.yaml +++ b/src/test/helm/deployment_test.yaml @@ -24,7 +24,7 @@ suite: test Vorgangfilter general values release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/deployment.yaml @@ -36,4 +36,4 @@ tests: of: Deployment - equal: path: spec.template.spec.containers[0].image - value: docker.ozg-sh.de/pluto:latest + value: docker.ozg-sh.de/vorgang-manager:latest diff --git a/src/test/helm/deployment_usermanager_url_test.yaml b/src/test/helm/deployment_usermanager_url_test.yaml index 2fdabccebc473fbba3cb90353ea74a3d9295cb93..fd5bca42b1bf75b138516f05cbdae813a609c307 100644 --- a/src/test/helm/deployment_usermanager_url_test.yaml +++ b/src/test/helm/deployment_usermanager_url_test.yaml @@ -24,7 +24,7 @@ suite: test environments release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/deployment.yaml @@ -36,5 +36,5 @@ tests: - contains: path: spec.template.spec.containers[0].env content: - name: kop_usermanager_url + name: ozgcloud_usermanager_url value: http://user-manager.sh-helm-test:8080/migration/user diff --git a/src/test/helm/deployment_zufimanager_address_test.yaml b/src/test/helm/deployment_zufimanager_address_test.yaml index c00409913e43524f036f40cf61441489c4323a87..79b51aad021a407788b5da56a2e92e09f8dd5f37 100644 --- a/src/test/helm/deployment_zufimanager_address_test.yaml +++ b/src/test/helm/deployment_zufimanager_address_test.yaml @@ -24,7 +24,7 @@ suite: test environments release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/deployment.yaml @@ -36,5 +36,5 @@ tests: - contains: path: spec.template.spec.containers[0].env content: - name: kop_zufimanager_address + name: ozgcloud_zufimanager_address value: dns://zufi.zufi-manager:9090 diff --git a/src/test/helm/elasticsearch-deployment-test.yaml b/src/test/helm/elasticsearch-deployment-test.yaml index 1288ef05a06c006230e63c696f8aebd08ba6f18a..c21bc7d99c00eb8f0e9c8872513dbeef5aff99e3 100644 --- a/src/test/helm/elasticsearch-deployment-test.yaml +++ b/src/test/helm/elasticsearch-deployment-test.yaml @@ -88,7 +88,7 @@ tests: - it: smoke test if elasticsearch is disabled when set to false template: deployment.yaml set: - kop.environment: test + ozgcloud.environment: test database.password: hase elasticsearch.enabled: false asserts: diff --git a/src/test/helm/elasticsearch-secret-test.yaml b/src/test/helm/elasticsearch-secret-test.yaml index afc30b9058d31417adeb8e8ca094b2a9912a68b3..a9825f35be4b66eecf2bde5d7860047ad0866c58 100644 --- a/src/test/helm/elasticsearch-secret-test.yaml +++ b/src/test/helm/elasticsearch-secret-test.yaml @@ -24,7 +24,7 @@ suite: elasticsearch tests release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/elasticsearch_secret.yaml diff --git a/src/test/helm/network_policy_test.yaml b/src/test/helm/network_policy_test.yaml index c44e76fc85d8505d946e042872f755d19d3bccd6..e0dcb7531dd8db23520220ce128bca37b2a013a3 100644 --- a/src/test/helm/network_policy_test.yaml +++ b/src/test/helm/network_policy_test.yaml @@ -41,7 +41,7 @@ tests: - equal: path: metadata value: - name: network-policy-pluto + name: network-policy-vorgang-manager namespace: by-helm-test - it: validate spec asserts: @@ -50,7 +50,7 @@ tests: value: podSelector: matchLabels: - component: pluto + component: vorgang-manager policyTypes: - Ingress - Egress diff --git a/src/test/helm/rabbitmq_exchange_test.yaml b/src/test/helm/rabbitmq_exchange_test.yaml index c8987e9547998bfbb76d2847373664c81af9b69a..8a8d0db7acd22d6b2e72b7730c4f9f3f5e825f1e 100644 --- a/src/test/helm/rabbitmq_exchange_test.yaml +++ b/src/test/helm/rabbitmq_exchange_test.yaml @@ -24,7 +24,7 @@ suite: test rabbitmq exchange release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/rabbitmq_exchange.yaml diff --git a/src/test/helm/rabbitmq_permissions_test.yaml b/src/test/helm/rabbitmq_permissions_test.yaml index 9a42c5f2f25c1f3e09594ade1e38cc5e5382b940..b680ac19caa9e22f859334ff4cd08a27ee7f12af 100644 --- a/src/test/helm/rabbitmq_permissions_test.yaml +++ b/src/test/helm/rabbitmq_permissions_test.yaml @@ -24,7 +24,7 @@ suite: test rabbitmq permissions release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/rabbitmq_permissions.yaml @@ -66,7 +66,7 @@ tests: count: 0 - it: should not create rabbitmq permission by default set: - kop.environment: test + ozgcloud.environment: test asserts: - hasDocuments: count: 0 \ No newline at end of file diff --git a/src/test/helm/rabbitmq_queue_test.yaml b/src/test/helm/rabbitmq_queue_test.yaml index 118f79c5cde226eb337ef82e65bdd8f2c1acbd8a..684814c49727b442295925fecd63841a6ccf8edf 100644 --- a/src/test/helm/rabbitmq_queue_test.yaml +++ b/src/test/helm/rabbitmq_queue_test.yaml @@ -24,7 +24,7 @@ suite: test rabbitmq queue release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/rabbitmq_queue.yaml diff --git a/src/test/helm/rabbitmq_user_test.yaml b/src/test/helm/rabbitmq_user_test.yaml index d2682e418bc37f46a27f62a2b5658e3ad855b453..e05eb4ddbb45c744ba2aaeb82904c3e4542e17ee 100644 --- a/src/test/helm/rabbitmq_user_test.yaml +++ b/src/test/helm/rabbitmq_user_test.yaml @@ -24,7 +24,7 @@ suite: test rabbitmq user release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/rabbitmq_user.yaml @@ -46,7 +46,7 @@ tests: count: 0 - it: should not create rabbitmq user by default set: - kop.environment: test + ozgcloud.environment: test asserts: - hasDocuments: count: 0 \ No newline at end of file diff --git a/src/test/helm/secret_bayernid_test.yaml b/src/test/helm/secret_bayernid_test.yaml index 127292eb11220735764cc6ed545b72fcb8c7033b..42e1c76f780753dabf08563a9d0a51a4252d6b7d 100644 --- a/src/test/helm/secret_bayernid_test.yaml +++ b/src/test/helm/secret_bayernid_test.yaml @@ -24,7 +24,7 @@ suite: test bayernid secret release: - name: pluto + name: vorgang-manager namespace: sh-test-test templates: - templates/secret_bayernid.yaml diff --git a/src/test/helm/service_monitor_test.yaml b/src/test/helm/service_monitor_test.yaml index 013b8375a4387d300c722b2cfbbcdd12da56c861..cc0272b3d78108c49f36c96b14029e49025244f3 100644 --- a/src/test/helm/service_monitor_test.yaml +++ b/src/test/helm/service_monitor_test.yaml @@ -24,18 +24,18 @@ suite: test deployment release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/service_monitor.yaml tests: - - it: should have the label component with value pluto-service-monitor attached + - it: should have the label component with value vorgang-manager-service-monitor attached asserts: - isKind: of: ServiceMonitor - equal: path: metadata.labels.[component] - value: pluto-service-monitor + value: vorgang-manager-service-monitor - it: should be able to enable the endpoint asserts: - isKind: @@ -50,16 +50,16 @@ tests: - contains: path: spec.namespaceSelector.matchNames content: sh-helm-test - - it: selector should contain the component label with the value pluto-service + - it: selector should contain the component label with the value vorgang-manager-service asserts: - equal: path: spec.selector.matchLabels.[component] - value: pluto-service + value: vorgang-manager-service - it: selector should contain helm recommended labels name and namespace asserts: - equal: path: spec.selector.matchLabels.[app.kubernetes.io/name] - value: pluto + value: vorgang-manager - equal: path: spec.selector.matchLabels.[app.kubernetes.io/namespace] value: sh-helm-test diff --git a/src/test/helm/service_test.yaml b/src/test/helm/service_test.yaml index 2d9f23f52ceecddc48b53155a16bfd89eba3cf98..354735400d721fc0c77a0d8957c39ff5b0fabee0 100644 --- a/src/test/helm/service_test.yaml +++ b/src/test/helm/service_test.yaml @@ -24,18 +24,18 @@ suite: test deployment release: - name: pluto + name: vorgang-manager namespace: sh-helm-test templates: - templates/service.yaml tests: - - it: should have the label component with value pluto-service attached + - it: should have the label component with value vorgang-manager-service attached asserts: - isKind: of: Service - equal: path: metadata.labels.[component] - value: pluto-service + value: vorgang-manager-service - it: should be of type ClusterIP asserts: - equal: @@ -61,16 +61,16 @@ tests: protocol: TCP count: 1 any: true - - it: selector should contain the component label with the value pluto + - it: selector should contain the component label with the value vorgang-manager asserts: - equal: path: spec.selector.[component] - value: pluto + value: vorgang-manager - it: selector should contain helm recommended labels name and namespace asserts: - equal: path: spec.selector.[app.kubernetes.io/name] - value: pluto + value: vorgang-manager - equal: path: spec.selector.[app.kubernetes.io/namespace] value: sh-helm-test diff --git a/src/test/unit-values.yaml b/src/test/unit-values.yaml index e806bb9c79efc2405ab29a2cf510b6a702bfff69..1421acce6b73d4ca0f1a95c41c9e6d6d30cf73d0 100644 --- a/src/test/unit-values.yaml +++ b/src/test/unit-values.yaml @@ -24,7 +24,7 @@ cluster_env: "" -kop: +ozgcloud: bundesland: sh bezeichner: helm environment: test