From 3e7c580595fd3899d85655c744df72ac6c252462 Mon Sep 17 00:00:00 2001 From: Jan Schoone <6106846+jschoone@users.noreply.github.com> Date: Thu, 18 Jul 2024 10:07:14 +0200 Subject: [PATCH] chore(cluster-class): rename machineDeployments (#139) * chore(cluster-class): rename machineDeployments Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> * change worker class in quickstart Signed-off-by: Danny Eiselt --------- Signed-off-by: Jan Schoone <6106846+jschoone@users.noreply.github.com> Signed-off-by: Danny Eiselt Co-authored-by: Danny Eiselt --- providers/openstack/README.md | 4 ++-- .../templates/cluster-class.yaml | 22 +++++++++---------- ...eadm-config-template-worker-openstack.yaml | 2 +- .../openstack-machine-template-worker.yaml | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/providers/openstack/README.md b/providers/openstack/README.md index df5727be..ac348d11 100644 --- a/providers/openstack/README.md +++ b/providers/openstack/README.md @@ -216,9 +216,9 @@ spec: version: v${CS_K8S_VERSION}.${CS_K8S_PATCH_VERSION} workers: machineDeployments: - - class: ${CS_CLASS_NAME} + - class: default-worker failureDomain: nova - name: ${CS_CLASS_NAME} + name: default-worker replicas: 3 EOF diff --git a/providers/openstack/scs/cluster-class/templates/cluster-class.yaml b/providers/openstack/scs/cluster-class/templates/cluster-class.yaml index 528b4622..864af392 100644 --- a/providers/openstack/scs/cluster-class/templates/cluster-class.yaml +++ b/providers/openstack/scs/cluster-class/templates/cluster-class.yaml @@ -20,18 +20,18 @@ spec: name: {{ .Release.Name }}-{{ .Chart.Version }}-cluster workers: machineDeployments: - - class: {{ .Release.Name }}-{{ .Chart.Version }} + - class: default-worker template: bootstrap: ref: apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate - name: {{ .Release.Name }}-{{ .Chart.Version }} + name: {{ .Release.Name }}-{{ .Chart.Version }}-default-worker infrastructure: ref: apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate - name: {{ .Release.Name }}-{{ .Chart.Version }} + name: {{ .Release.Name }}-{{ .Chart.Version }}-default-worker variables: - name: external_id required: false @@ -317,7 +317,7 @@ cre ate group names like oidc:engineering and oidc:infra." controlPlane: true machineDeploymentClass: names: - - {{ .Release.Name }}-{{ .Chart.Version }} + - default-worker jsonPatches: - op: replace path: "/spec/template/spec/image/filter/name" @@ -512,7 +512,7 @@ cre ate group names like oidc:engineering and oidc:infra." controlPlane: false machineDeploymentClass: names: - - {{ .Release.Name }}-{{ .Chart.Version }} + - default-worker jsonPatches: - op: replace path: "/spec/template/spec/flavor" @@ -544,7 +544,7 @@ cre ate group names like oidc:engineering and oidc:infra." controlPlane: false machineDeploymentClass: names: - - {{ .Release.Name }}-{{ .Chart.Version }} + - default-worker jsonPatches: - op: add path: "/spec/template/spec/rootVolume" @@ -576,7 +576,7 @@ cre ate group names like oidc:engineering and oidc:infra." controlPlane: true machineDeploymentClass: names: - - {{ .Release.Name }}-{{ .Chart.Version }} + - default-worker jsonPatches: - op: add path: "/spec/template/spec/securityGroups" @@ -612,7 +612,7 @@ cre ate group names like oidc:engineering and oidc:infra." controlPlane: true machineDeploymentClass: names: - - {{ .Release.Name }}-{{ .Chart.Version }} + - default-worker jsonPatches: - op: replace path: "/spec/template/spec/identityRef/cloudName" @@ -639,7 +639,7 @@ cre ate group names like oidc:engineering and oidc:infra." controlPlane: true machineDeploymentClass: names: - - {{ .Release.Name }}-{{ .Chart.Version }} + - default-worker jsonPatches: - op: replace path: "/spec/template/spec/identityRef/name" @@ -671,7 +671,7 @@ cre ate group names like oidc:engineering and oidc:infra." controlPlane: false machineDeploymentClass: names: - - {{ .Release.Name }}-{{ .Chart.Version }} + - default-worker jsonPatches: - op: add path: "/spec/template/spec/serverGroup" @@ -689,7 +689,7 @@ cre ate group names like oidc:engineering and oidc:infra." controlPlane: true machineDeploymentClass: names: - - {{ .Release.Name }}-{{ .Chart.Version }} + - default-worker jsonPatches: - op: add path: "/spec/template/spec/sshKeyName" diff --git a/providers/openstack/scs/cluster-class/templates/kubeadm-config-template-worker-openstack.yaml b/providers/openstack/scs/cluster-class/templates/kubeadm-config-template-worker-openstack.yaml index 8f3b770a..2e9ff290 100644 --- a/providers/openstack/scs/cluster-class/templates/kubeadm-config-template-worker-openstack.yaml +++ b/providers/openstack/scs/cluster-class/templates/kubeadm-config-template-worker-openstack.yaml @@ -1,7 +1,7 @@ apiVersion: bootstrap.cluster.x-k8s.io/v1beta1 kind: KubeadmConfigTemplate metadata: - name: {{ .Release.Name }}-{{ .Chart.Version }} + name: {{ .Release.Name }}-{{ .Chart.Version }}-default-worker spec: template: spec: diff --git a/providers/openstack/scs/cluster-class/templates/openstack-machine-template-worker.yaml b/providers/openstack/scs/cluster-class/templates/openstack-machine-template-worker.yaml index b05b83d5..8efd8b5c 100644 --- a/providers/openstack/scs/cluster-class/templates/openstack-machine-template-worker.yaml +++ b/providers/openstack/scs/cluster-class/templates/openstack-machine-template-worker.yaml @@ -1,7 +1,7 @@ apiVersion: infrastructure.cluster.x-k8s.io/v1beta1 kind: OpenStackMachineTemplate metadata: - name: {{ .Release.Name }}-{{ .Chart.Version }} + name: {{ .Release.Name }}-{{ .Chart.Version }}-default-worker spec: template: spec: