removed harded coded cluster name. allow machine pools in mgr

newrelic-forks · Mar 22, 2024 · 58229e2 · 58229e2
1 parent f8a4a58
commit 58229e2
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -21,7 +21,7 @@ spec:
       containers:
       - args:
         - --leader-elect
-        - --feature-gates=GKE=${EXP_CAPG_GKE:=false}
+        - --feature-gates=GKE=${EXP_CAPG_GKE:=false},MachinePool=${EXP_MACHINE_POOL:=false}
         - "--diagnostics-address=${CAPG_DIAGNOSTICS_ADDRESS:=:8443}"
         - "--insecure-diagnostics=${CAPG_INSECURE_DIAGNOSTICS:=false}"
         - "--v=${CAPG_LOGLEVEL:=0}"

diff --git a/templates/custom_network/cluster-template.yaml b/templates/custom_network/cluster-template.yaml
@@ -29,13 +29,13 @@ spec:
     autoCreateSubnetworks: false
     subnets:
       - cidrBlock: "192.168.0.0/17"
-        name: cf1g-subnet-1
+        name: "${CLUSTER_NAME}-subnet-1"
         region: us-east-1
       - cidrBlock: "192.168.128.0/18"
-        name: cf1g-subnet-2
+        name: "${CLUSTER_NAME}-subnet-2"
         region: us-east-1
       - cidrBlock: "192.168.192.0/18"
-        name: cf1g-subnet-3
+        name: "${CLUSTER_NAME}-subnet-3"
         region: us-east-1
 ---
 kind: KubeadmControlPlane
@@ -80,7 +80,7 @@ spec:
     spec:
       instanceType: "${GCP_CONTROL_PLANE_MACHINE_TYPE}"
       image: "${IMAGE_ID}"
-      subnet: cf1g-subnet-1
+      subnet: "${CLUSTER_NAME}-subnet-1"
 ---
 apiVersion: cluster.x-k8s.io/v1beta1
 kind: MachineDeployment
@@ -114,7 +114,7 @@ spec:
     spec:
       instanceType: "${GCP_NODE_MACHINE_TYPE}"
       image: "${IMAGE_ID}"
-      subnet: cf1g-subnet-2
+      subnet: "${CLUSTER_NAME}-subnet-2"
 ---
 apiVersion: bootstrap.cluster.x-k8s.io/v1beta1
 kind: KubeadmConfigTemplate