From d59bc9e1dbeae46d10e816b2fcc8d9299f4ac9e4 Mon Sep 17 00:00:00 2001 From: Chris Werner Rau Date: Fri, 26 Apr 2024 10:05:56 +0200 Subject: [PATCH] =?UTF-8?q?chore(t8s-cluster/management-cluster)!:=20Rever?= =?UTF-8?q?t=20"feat(t8s-cluster/mana=E2=80=A6=20(#903)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- charts/t8s-cluster/README.md.gotmpl | 5 +++++ charts/t8s-cluster/ci/artifacthub-values.yaml | 2 -- charts/t8s-cluster/templates/management-cluster/cluster.yaml | 3 --- charts/t8s-cluster/values.schema.json | 3 --- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/charts/t8s-cluster/README.md.gotmpl b/charts/t8s-cluster/README.md.gotmpl index 5258b7632..30d53213c 100644 --- a/charts/t8s-cluster/README.md.gotmpl +++ b/charts/t8s-cluster/README.md.gotmpl @@ -29,4 +29,9 @@ kustomize, which means that you have to either manually add the required labels everything or, which we would recommend, just uninstall the ccm, the csi and delete the cloud-config secret, as these will just be recreated during installation. + +### 5.x.x -> 7.x.x + +Just skip version 6.x.x, as there was a mistake and it has been reverted. + {{ .Files.Get "values.md" }} diff --git a/charts/t8s-cluster/ci/artifacthub-values.yaml b/charts/t8s-cluster/ci/artifacthub-values.yaml index b1924e89c..e69de29bb 100644 --- a/charts/t8s-cluster/ci/artifacthub-values.yaml +++ b/charts/t8s-cluster/ci/artifacthub-values.yaml @@ -1,2 +0,0 @@ -metadata: - environment: production diff --git a/charts/t8s-cluster/templates/management-cluster/cluster.yaml b/charts/t8s-cluster/templates/management-cluster/cluster.yaml index 02f2a12f7..a27607f70 100644 --- a/charts/t8s-cluster/templates/management-cluster/cluster.yaml +++ b/charts/t8s-cluster/templates/management-cluster/cluster.yaml @@ -24,9 +24,6 @@ spec: teutonetesCloudRef: kind: TeutonetesCloud name: {{ required "You need to set the `cloud`" .Values.cloud }} - {{- with .Values.metadata.environment }} - environment: {{ . | quote }} - {{- end }} {{- with .Values.version }} version: {{ printf "v%d.%d.%d" (.major | int) (.minor | int) (.patch | int) }} {{- end }} diff --git a/charts/t8s-cluster/values.schema.json b/charts/t8s-cluster/values.schema.json index 8551fabe7..23481e1f5 100644 --- a/charts/t8s-cluster/values.schema.json +++ b/charts/t8s-cluster/values.schema.json @@ -106,9 +106,6 @@ }, "remarks": { "type": "string" - }, - "environment": { - "type": "string" } }, "required": [