diff --git a/manifests/function/k8scontrol-capg/cluster.yaml b/manifests/function/k8scontrol-capg/cluster.yaml index 43aee1232..f0515b92d 100644 --- a/manifests/function/k8scontrol-capg/cluster.yaml +++ b/manifests/function/k8scontrol-capg/cluster.yaml @@ -2,7 +2,7 @@ apiVersion: cluster.x-k8s.io/v1alpha3 kind: Cluster metadata: - name: "gtc" + name: "target-cluster" namespace: default spec: clusterNetwork: @@ -11,16 +11,16 @@ spec: infrastructureRef: apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 kind: GCPCluster - name: "gtc" + name: "target-cluster" controlPlaneRef: kind: KubeadmControlPlane apiVersion: controlplane.cluster.x-k8s.io/v1alpha3 - name: "gtc-control-plane" + name: "target-cluster-control-plane" --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 kind: GCPCluster metadata: - name: "gtc" + name: "target-cluster" namespace: default spec: project: "${GCP_PROJECT}" diff --git a/manifests/function/k8scontrol-capg/controlplane.yaml b/manifests/function/k8scontrol-capg/controlplane.yaml index 219a0ee0a..edce1cd8d 100644 --- a/manifests/function/k8scontrol-capg/controlplane.yaml +++ b/manifests/function/k8scontrol-capg/controlplane.yaml @@ -1,14 +1,14 @@ kind: KubeadmControlPlane apiVersion: controlplane.cluster.x-k8s.io/v1alpha3 metadata: - name: "gtc-control-plane" + name: "target-cluster-control-plane" namespace: default spec: replicas: "${CONTROL_PLANE_MACHINE_COUNT}" infrastructureTemplate: kind: GCPMachineTemplate apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 - name: "gtc-control-plane" + name: "target-cluster-control-plane" kubeadmConfigSpec: initConfiguration: nodeRegistration: @@ -29,14 +29,12 @@ spec: name: '{{ ds.meta_data.local_hostname.split(".")[0] }}' kubeletExtraArgs: cloud-provider: gce - postKubeadmCommands: - - sudo kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f https://docs.projectcalico.org/v3.15/manifests/calico.yaml - version: "v1.16.14" + version: "v1.17.14" --- kind: GCPMachineTemplate apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 metadata: - name: "gtc-control-plane" + name: "target-cluster-control-plane" namespace: default spec: template: diff --git a/manifests/function/workers-capg/workers.yaml b/manifests/function/workers-capg/workers.yaml index b58cda3ed..13a0ca395 100644 --- a/manifests/function/workers-capg/workers.yaml +++ b/manifests/function/workers-capg/workers.yaml @@ -1,32 +1,32 @@ apiVersion: cluster.x-k8s.io/v1alpha3 kind: MachineDeployment metadata: - name: "gtc-md-0" + name: "target-cluster-md-0" namespace: default spec: - clusterName: "gtc" + clusterName: "target-cluster" replicas: "${WORKER_MACHINE_COUNT}" selector: matchLabels: template: spec: - clusterName: "gtc" + clusterName: "target-cluster" failureDomain: "${GCP_REGION}" - version: "v1.16.14" + version: "v1.17.14" bootstrap: configRef: - name: "gtc-md-0" + name: "target-cluster-md-0" apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3 kind: KubeadmConfigTemplate infrastructureRef: - name: "gtc-md-0" + name: "target-cluster-md-0" apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 kind: GCPMachineTemplate --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha3 kind: GCPMachineTemplate metadata: - name: "gtc-md-0" + name: "target-cluster-md-0" namespace: default spec: template: @@ -36,7 +36,7 @@ spec: apiVersion: bootstrap.cluster.x-k8s.io/v1alpha3 kind: KubeadmConfigTemplate metadata: - name: "gtc-md-0" + name: "target-cluster-md-0" namespace: default spec: template: