From 48aa23648840d35682984c923fe36a5e57b4efdd Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Tue, 12 Nov 2019 21:57:18 +0900 Subject: [PATCH] Finalize patches for remaining CAPI objects Finish patches for all remaining CAPI objects Signed-off-by: Scott Lowe --- .../usw2-cluster1/awscluster-details.yaml | 8 -- .../usw2-cluster1/awscluster-patch-name.json | 3 - .../usw2-cluster1/awscluster-patch.json | 5 ++ ...me.json => awsmachine-cp0-patch-name.json} | 0 .../awsmachine-cp1-patch-name.json | 3 + .../awsmachine-cp2-patch-name.json | 3 + .../awsmachinetemplate-details.yaml | 11 +++ .../awsmachinetemplate-patch-name.json | 3 + ...ter-patch-name.json => cluster-patch.json} | 0 .../kubeadmconfigtemplate-patch-name.json | 3 + .../overlays/usw2-cluster1/kustomization.yaml | 74 +++++++++++++++++-- ...-name.json => machine-cp0-patch-name.json} | 0 .../usw2-cluster1/machine-cp1-patch-name.json | 5 ++ .../usw2-cluster1/machine-cp2-patch-name.json | 5 ++ .../machinedeployment-labels.yaml | 3 + .../machinedeployment-patch.json | 5 ++ 16 files changed, 113 insertions(+), 18 deletions(-) delete mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-details.yaml delete mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch.json rename kubernetes/capi-kustomize/overlays/usw2-cluster1/{awsmachine-patch-name.json => awsmachine-cp0-patch-name.json} (100%) create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp1-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp2-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachinetemplate-details.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachinetemplate-patch-name.json rename kubernetes/capi-kustomize/overlays/usw2-cluster1/{cluster-patch-name.json => cluster-patch.json} (100%) create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/kubeadmconfigtemplate-patch-name.json rename kubernetes/capi-kustomize/overlays/usw2-cluster1/{machine-patch-name.json => machine-cp0-patch-name.json} (100%) create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp1-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp2-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-patch.json diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-details.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-details.yaml deleted file mode 100644 index 5a9bca4..0000000 --- a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-details.yaml +++ /dev/null @@ -1,8 +0,0 @@ ---- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 -kind: AWSCluster -metadata: - name: .* -spec: - region: us-west-2 - sshKeyName: usw2_rsa_key diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch-name.json deleted file mode 100644 index d789bac..0000000 --- a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch-name.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster-1" } -] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch.json new file mode 100644 index 0000000..092ae41 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster-1" }, + { "op": "replace", "path": "/spec/region", "value": "us-west-2" }, + { "op": "replace", "path": "/spec/sshKeyName", "value": "usw2_rsa_key" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp0-patch-name.json similarity index 100% rename from kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-patch-name.json rename to kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp0-patch-name.json diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp1-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp1-patch-name.json new file mode 100644 index 0000000..fd68b45 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp1-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster1-cp1" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp2-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp2-patch-name.json new file mode 100644 index 0000000..e502831 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-cp2-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster1-cp2" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachinetemplate-details.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachinetemplate-details.yaml new file mode 100644 index 0000000..9a4664a --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachinetemplate-details.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachineTemplate +metadata: + name: .* +spec: + template: + spec: + sshKeyName: usw2_rsa_key + # Uncomment following line to change instance type + #instanceType: m5.xlarge diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachinetemplate-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachinetemplate-patch-name.json new file mode 100644 index 0000000..e65a5c5 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachinetemplate-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-c1-nodepool0" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-patch.json similarity index 100% rename from kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-patch-name.json rename to kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-patch.json diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kubeadmconfigtemplate-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kubeadmconfigtemplate-patch-name.json new file mode 100644 index 0000000..e65a5c5 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kubeadmconfigtemplate-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-c1-nodepool0" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml index c8e962e..ef2ca4a 100644 --- a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml @@ -9,32 +9,92 @@ patchesJson6902: version: v1alpha2 kind: Cluster name: capi-quickstart - path: cluster-patch-name.json + path: cluster-patch.json - target: group: infrastructure.cluster.x-k8s.io version: v1alpha2 kind: AWSCluster name: capi-quickstart - path: awscluster-patch-name.json + path: awscluster-patch.json - target: group: cluster.x-k8s.io version: v1alpha2 kind: Machine name: capi-quickstart-controlplane-0 - path: machine-patch-name.json + path: machine-cp0-patch-name.json - target: group: infrastructure.cluster.x-k8s.io version: v1alpha2 kind: AWSMachine name: capi-quickstart-controlplane-0 - path: awsmachine-patch-name.json + path: awsmachine-cp0-patch-name.json + - target: + group: bootstrap.cluster.x-k8s.io + version: v1alpha2 + kind: KubeadmConfig + name: capi-quickstart-controlplane-0 + path: awsmachine-cp0-patch-name.json + - target: + group: cluster.x-k8s.io + version: v1alpha2 + kind: Machine + name: capi-quickstart-controlplane-1 + path: machine-cp1-patch-name.json + - target: + group: infrastructure.cluster.x-k8s.io + version: v1alpha2 + kind: AWSMachine + name: capi-quickstart-controlplane-1 + path: awsmachine-cp1-patch-name.json + - target: + group: bootstrap.cluster.x-k8s.io + version: v1alpha2 + kind: KubeadmConfig + name: capi-quickstart-controlplane-1 + path: awsmachine-cp1-patch-name.json + - target: + group: cluster.x-k8s.io + version: v1alpha2 + kind: Machine + name: capi-quickstart-controlplane-2 + path: machine-cp2-patch-name.json + - target: + group: infrastructure.cluster.x-k8s.io + version: v1alpha2 + kind: AWSMachine + name: capi-quickstart-controlplane-2 + path: awsmachine-cp2-patch-name.json + - target: + group: bootstrap.cluster.x-k8s.io + version: v1alpha2 + kind: KubeadmConfig + name: capi-quickstart-controlplane-2 + path: awsmachine-cp2-patch-name.json + - target: + group: infrastructure.cluster.x-k8s.io + version: v1alpha2 + kind: AWSMachineTemplate + name: capi-quickstart-worker + path: awsmachinetemplate-patch-name.json + - target: + group: cluster.x-k8s.io + version: v1alpha2 + kind: MachineDeployment + name: capi-quickstart-worker + path: machinedeployment-patch.json + - target: + group: bootstrap.cluster.x-k8s.io + version: v1alpha2 + kind: KubeadmConfigTemplate + name: capi-quickstart-worker + path: kubeadmconfigtemplate-patch-name.json patches: - target: group: infrastructure.cluster.x-k8s.io version: v1alpha2 - kind: AWSCluster - name: capi-quickstart - path: awscluster-details.yaml + kind: AWSMachineTemplate + name: capi-quickstart-worker + path: awsmachinetemplate-details.yaml - target: group: cluster.x-k8s.io version: v1alpha2 diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp0-patch-name.json similarity index 100% rename from kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-patch-name.json rename to kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp0-patch-name.json diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp1-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp1-patch-name.json new file mode 100644 index 0000000..df4d15b --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp1-patch-name.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster1-cp1" }, + { "op": "replace", "path": "/spec/bootstrap/configRef/name", "value": "usw2-cluster1-cp1" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "usw2-cluster1-cp1" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp2-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp2-patch-name.json new file mode 100644 index 0000000..087a203 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-cp2-patch-name.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster1-cp2" }, + { "op": "replace", "path": "/spec/bootstrap/configRef/name", "value": "usw2-cluster1-cp2" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "usw2-cluster1-cp2" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml index fd67f0f..f248bfd 100644 --- a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml @@ -5,11 +5,14 @@ metadata: name: .* labels: cluster.x-k8s.io/cluster-name: "usw2-cluster1" + nodepool: "usw2-c1-nodepool0" spec: selector: matchLabels: cluster.x-k8s.io/cluster-name: "usw2-cluster1" + nodepool: "usw2-c1-nodepool0" template: metadata: labels: cluster.x-k8s.io/cluster-name: "usw2-cluster1" + nodepool: "usw2-c1-nodepool0" diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-patch.json new file mode 100644 index 0000000..725b861 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-patch.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-c1-nodepool0" }, + { "op": "replace", "path": "/spec/template/spec/bootstrap/configRef/name", "value": "usw2-c1-nodepool0" }, + { "op": "replace", "path": "/spec/template/spec/infrastructureRef/name", "value": "usw2-c1-nodepool0" } +]