Skip to content

Commit 0257d77

Browse files
committedJan 29, 2025
Make child cluster name configurable from environ
1 parent 537f270 commit 0257d77

8 files changed

+11
-10
lines changed
 

‎Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
NAMESPACE ?= kcm-system
2+
CLUSTER_NAME_SUFFIX ?= dev
23
VERSION ?= $(shell git describe --tags --always)
34
VERSION := $(patsubst v%,%,$(VERSION))
45
FQDN_VERSION = $(subst .,-,$(VERSION))
@@ -370,11 +371,11 @@ dev-destroy: kind-undeploy registry-undeploy ## Destroy the development environm
370371

371372
.PHONY: dev-mcluster-apply
372373
dev-mcluster-apply: envsubst ## Create dev managed cluster using 'config/dev/$(DEV_PROVIDER)-clusterdeployment.yaml'
373-
@NAMESPACE=$(NAMESPACE) $(ENVSUBST) -no-unset -i config/dev/$(DEV_PROVIDER)-clusterdeployment.yaml | $(KUBECTL) apply -f -
374+
@NAMESPACE=$(NAMESPACE) CLUSTER_NAME_SUFFIX=$(CLUSTER_NAME_SUFFIX) $(ENVSUBST) -no-unset -i config/dev/$(DEV_PROVIDER)-clusterdeployment.yaml | $(KUBECTL) apply -f -
374375

375376
.PHONY: dev-mcluster-delete
376377
dev-mcluster-delete: envsubst ## Delete dev managed cluster using 'config/dev/$(DEV_PROVIDER)-clusterdeployment.yaml'
377-
@NAMESPACE=$(NAMESPACE) $(ENVSUBST) -no-unset -i config/dev/$(DEV_PROVIDER)-clusterdeployment.yaml | $(KUBECTL) delete -f -
378+
@NAMESPACE=$(NAMESPACE) CLUSTER_NAME_SUFFIX=$(CLUSTER_NAME_SUFFIX) $(ENVSUBST) -no-unset -i config/dev/$(DEV_PROVIDER)-clusterdeployment.yaml | $(KUBECTL) delete -f -
378379

379380
.PHONY: dev-creds-apply
380381
dev-creds-apply: dev-$(DEV_PROVIDER)-creds ## Create credentials resources for $DEV_PROVIDER

‎config/dev/adopted-clusterdeployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: k0rdent.mirantis.com/v1alpha1
22
kind: ClusterDeployment
33
metadata:
4-
name: adopted-dev
4+
name: adopted-${CLUSTER_NAME_SUFFIX}
55
namespace: ${NAMESPACE}
66
spec:
77
template: adopted-cluster-0-0-2

‎config/dev/aks-clusterdeployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: k0rdent.mirantis.com/v1alpha1
22
kind: ClusterDeployment
33
metadata:
4-
name: azure-aks-dev
4+
name: azure-aks-${CLUSTER_NAME_SUFFIX}
55
namespace: ${NAMESPACE}
66
spec:
77
template: azure-aks-0-0-2

‎config/dev/aws-clusterdeployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: k0rdent.mirantis.com/v1alpha1
22
kind: ClusterDeployment
33
metadata:
4-
name: aws-dev
4+
name: aws-${CLUSTER_NAME_SUFFIX}
55
namespace: ${NAMESPACE}
66
spec:
77
template: aws-standalone-cp-0-0-5

‎config/dev/azure-clusterdeployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: k0rdent.mirantis.com/v1alpha1
22
kind: ClusterDeployment
33
metadata:
4-
name: azure-dev
4+
name: azure-${CLUSTER_NAME_SUFFIX}
55
namespace: ${NAMESPACE}
66
spec:
77
template: azure-standalone-cp-0-0-5

‎config/dev/eks-clusterdeployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: k0rdent.mirantis.com/v1alpha1
22
kind: ClusterDeployment
33
metadata:
4-
name: eks-dev
4+
name: eks-${CLUSTER_NAME_SUFFIX}
55
namespace: ${NAMESPACE}
66
spec:
77
template: aws-eks-0-0-4

‎config/dev/openstack-clusterdeployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: k0rdent.mirantis.com/v1alpha1
22
kind: ClusterDeployment
33
metadata:
4-
name: openstack-dev
4+
name: openstack-${CLUSTER_NAME_SUFFIX}
55
namespace: ${NAMESPACE}
66
spec:
77
template: openstack-standalone-cp-0-0-5

‎config/dev/vsphere-clusterdeployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
apiVersion: k0rdent.mirantis.com/v1alpha1
22
kind: ClusterDeployment
33
metadata:
4-
name: vsphere-dev
4+
name: vsphere-${CLUSTER_NAME_SUFFIX}
55
namespace: ${NAMESPACE}
66
spec:
7-
template: vsphere-standalone-cp-0-0-5
7+
template: vsphere-standalone-cp-0-0-6
88
credential: vsphere-cluster-identity-cred
99
config:
1010
controlPlaneNumber: 1

0 commit comments

Comments
 (0)