From 21720e2da870b16b47e1e6ab605b3a7433b26564 Mon Sep 17 00:00:00 2001
From: Lukas Malte Monnerjahn <lukasmalte.monnerjahn@dataport.de>
Date: Mon, 13 Jan 2025 17:55:54 +0100
Subject: [PATCH] helm chart name matches maven artifactId
---
src/main/helm/Chart.yaml | 2 +-
src/test/helm/deployment_63_chars_test.yaml | 2 +-
src/test/helm/deployment_defaults_labels_test.yaml | 4 ++--
src/test/helm/service_monitor_test.yaml | 4 ++--
src/test/helm/service_test.yaml | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/main/helm/Chart.yaml b/src/main/helm/Chart.yaml
index a8fa2abf..97aab611 100644
--- a/src/main/helm/Chart.yaml
+++ b/src/main/helm/Chart.yaml
@@ -26,6 +26,6 @@ apiVersion: v1
appVersion: "1.1"
description: A Helm chart for Intelliform Adapter
name: intelliform-adapter
-version: 0.0.0-MANAGED-BY-JENKINS
+version: 0.0.0-MANAGED-BY-CI
icon: https://simpleicons.org/icons/helm.svg
diff --git a/src/test/helm/deployment_63_chars_test.yaml b/src/test/helm/deployment_63_chars_test.yaml
index 62c2f8e3..6d70e737 100644
--- a/src/test/helm/deployment_63_chars_test.yaml
+++ b/src/test/helm/deployment_63_chars_test.yaml
@@ -50,7 +50,7 @@ tests:
version: 1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890
asserts:
- failedTemplate:
- errorMessage: .Chart.Name-.Chart.Version Intelliform-Adapter-1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890 ist zu lang (max. 63 Zeichen)
+ errorMessage: .Chart.Name-.Chart.Version intelliform-adapter-1.0-test1234567890123123456789012345678901234567890123456789012345678901234567890123456789012345678904567890 ist zu lang (max. 63 Zeichen)
- it: should not fail on .Chart.Name-.Chart.Version length less than 63 characters
asserts:
- notFailedTemplate: {}
\ No newline at end of file
diff --git a/src/test/helm/deployment_defaults_labels_test.yaml b/src/test/helm/deployment_defaults_labels_test.yaml
index 4e2d5f7f..0c32159a 100644
--- a/src/test/helm/deployment_defaults_labels_test.yaml
+++ b/src/test/helm/deployment_defaults_labels_test.yaml
@@ -43,7 +43,7 @@ tests:
app.kubernetes.io/name: intelliform-adapter
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: Intelliform-Adapter-0.0.0-MANAGED-BY-JENKINS
+ app.kubernetes.io/version: 0.0.0-MANAGED-BY-CI
+ helm.sh/chart: intelliform-adapter-0.0.0-MANAGED-BY-CI
ozg-component: eingangsadapter
diff --git a/src/test/helm/service_monitor_test.yaml b/src/test/helm/service_monitor_test.yaml
index c85a7a6b..2e9c3e3f 100644
--- a/src/test/helm/service_monitor_test.yaml
+++ b/src/test/helm/service_monitor_test.yaml
@@ -55,9 +55,9 @@ tests:
app.kubernetes.io/name: afm-adapter
app.kubernetes.io/namespace: sh-helm-test
app.kubernetes.io/part-of: ozgcloud
- app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
+ app.kubernetes.io/version: 0.0.0-MANAGED-BY-CI
component: afm-adapter-service-monitor
- helm.sh/chart: Intelliform-Adapter-0.0.0-MANAGED-BY-JENKINS
+ helm.sh/chart: intelliform-adapter-0.0.0-MANAGED-BY-CI
ozg-component: eingangsadapter
- it: should have the metrics endpoint configured by default
diff --git a/src/test/helm/service_test.yaml b/src/test/helm/service_test.yaml
index ebc38d5c..3257b595 100644
--- a/src/test/helm/service_test.yaml
+++ b/src/test/helm/service_test.yaml
@@ -94,7 +94,7 @@ tests:
app.kubernetes.io/name: afm-adapter
app.kubernetes.io/namespace: sh-helm-test
app.kubernetes.io/part-of: ozgcloud
- app.kubernetes.io/version: 0.0.0-MANAGED-BY-JENKINS
+ app.kubernetes.io/version: 0.0.0-MANAGED-BY-CI
component: afm-adapter-service
- helm.sh/chart: Intelliform-Adapter-0.0.0-MANAGED-BY-JENKINS
+ helm.sh/chart: intelliform-adapter-0.0.0-MANAGED-BY-CI
ozg-component: eingangsadapter
\ No newline at end of file
--
GitLab