From 07381c9d98955a926b228fa39802715a9b0fac2c Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Wed, 13 Nov 2019 11:06:31 +0900 Subject: [PATCH] Add overlay for second us-west-2 cluster Add overlay patches and kustomization.yaml for usw2-cluster2 (second us-west-2 cluster). Signed-off-by: Scott Lowe --- .../usw2-cluster2/awscluster-patch.json | 5 + .../awsmachine-cp0-patch-name.json | 3 + .../awsmachine-cp1-patch-name.json | 3 + .../awsmachine-cp2-patch-name.json | 3 + .../usw2-cluster2/awsmachine-details.yaml | 9 ++ .../awsmachinetemplate-details.yaml | 11 ++ .../awsmachinetemplate-patch-name.json | 3 + .../overlays/usw2-cluster2/cluster-patch.json | 4 + .../kubeadmconfigtemplate-patch-name.json | 3 + .../overlays/usw2-cluster2/kustomization.yaml | 110 ++++++++++++++++++ .../usw2-cluster2/machine-cp0-patch-name.json | 5 + .../usw2-cluster2/machine-cp1-patch-name.json | 5 + .../usw2-cluster2/machine-cp2-patch-name.json | 5 + .../usw2-cluster2/machine-labels.yaml | 7 ++ .../machinedeployment-labels.yaml | 18 +++ .../machinedeployment-patch.json | 5 + 16 files changed, 199 insertions(+) create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/awscluster-patch.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp0-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp1-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp2-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-details.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachinetemplate-details.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachinetemplate-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/cluster-patch.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/kubeadmconfigtemplate-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp0-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp1-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp2-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-labels.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/machinedeployment-labels.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/machinedeployment-patch.json diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/awscluster-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awscluster-patch.json new file mode 100644 index 0000000..199c553 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awscluster-patch.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster-2" }, + { "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-cluster2/awsmachine-cp0-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp0-patch-name.json new file mode 100644 index 0000000..f58a733 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp0-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster2-cp0" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp1-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp1-patch-name.json new file mode 100644 index 0000000..a4c88f1 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp1-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster2-cp1" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp2-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp2-patch-name.json new file mode 100644 index 0000000..be3c82b --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-cp2-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster2-cp2" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-details.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-details.yaml new file mode 100644 index 0000000..b047848 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachine-details.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachine +metadata: + name: .* +spec: + sshKeyName: usw2_rsa_key + # Uncomment following line to change instance type + #instanceType: m5.xlarge diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachinetemplate-details.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachinetemplate-details.yaml new file mode 100644 index 0000000..574f7d6 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/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-cluster2/awsmachinetemplate-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachinetemplate-patch-name.json new file mode 100644 index 0000000..1304d82 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/awsmachinetemplate-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-c2-nodepool0" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/cluster-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/cluster-patch.json new file mode 100644 index 0000000..8d82c20 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/cluster-patch.json @@ -0,0 +1,4 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster-2" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "usw2-cluster-2" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/kubeadmconfigtemplate-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/kubeadmconfigtemplate-patch-name.json new file mode 100644 index 0000000..1304d82 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/kubeadmconfigtemplate-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-c2-nodepool0" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/kustomization.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster2/kustomization.yaml index c12b156..ef2ca4a 100644 --- a/kubernetes/capi-kustomize/overlays/usw2-cluster2/kustomization.yaml +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/kustomization.yaml @@ -3,3 +3,113 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - ../../base +patchesJson6902: + - target: + group: cluster.x-k8s.io + version: v1alpha2 + kind: Cluster + name: capi-quickstart + path: cluster-patch.json + - target: + group: infrastructure.cluster.x-k8s.io + version: v1alpha2 + kind: AWSCluster + name: capi-quickstart + path: awscluster-patch.json + - target: + group: cluster.x-k8s.io + version: v1alpha2 + kind: Machine + name: capi-quickstart-controlplane-0 + path: machine-cp0-patch-name.json + - target: + group: infrastructure.cluster.x-k8s.io + version: v1alpha2 + kind: AWSMachine + name: capi-quickstart-controlplane-0 + 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: AWSMachineTemplate + name: capi-quickstart-worker + path: awsmachinetemplate-details.yaml + - target: + group: cluster.x-k8s.io + version: v1alpha2 + kind: Machine + name: .* + path: machine-labels.yaml + - target: + group: cluster.x-k8s.io + version: v1alpha2 + kind: MachineDeployment + name: .* + path: machinedeployment-labels.yaml + - target: + group: infrastructure.cluster.x-k8s.io + version: v1alpha2 + kind: AWSMachine + name: .* + path: awsmachine-details.yaml diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp0-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp0-patch-name.json new file mode 100644 index 0000000..d33c92b --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp0-patch-name.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster2-cp0" }, + { "op": "replace", "path": "/spec/bootstrap/configRef/name", "value": "usw2-cluster2-cp0" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "usw2-cluster2-cp0" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp1-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp1-patch-name.json new file mode 100644 index 0000000..ae03922 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp1-patch-name.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster2-cp1" }, + { "op": "replace", "path": "/spec/bootstrap/configRef/name", "value": "usw2-cluster2-cp1" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "usw2-cluster2-cp1" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp2-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp2-patch-name.json new file mode 100644 index 0000000..a3909e7 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-cp2-patch-name.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster2-cp2" }, + { "op": "replace", "path": "/spec/bootstrap/configRef/name", "value": "usw2-cluster2-cp2" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "usw2-cluster2-cp2" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-labels.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-labels.yaml new file mode 100644 index 0000000..9faff97 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machine-labels.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: Machine +metadata: + name: .* + labels: + cluster.x-k8s.io/cluster-name: "usw2-cluster2" diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/machinedeployment-labels.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machinedeployment-labels.yaml new file mode 100644 index 0000000..fba484c --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machinedeployment-labels.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: MachineDeployment +kind: MachineDeployment +metadata: + name: .* + labels: + cluster.x-k8s.io/cluster-name: "usw2-cluster2" + nodepool: "usw2-c2-nodepool0" +spec: + selector: + matchLabels: + cluster.x-k8s.io/cluster-name: "usw2-cluster2" + nodepool: "usw2-c2-nodepool0" + template: + metadata: + labels: + cluster.x-k8s.io/cluster-name: "usw2-cluster2" + nodepool: "usw2-c2-nodepool0" diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/machinedeployment-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machinedeployment-patch.json new file mode 100644 index 0000000..47391c4 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/machinedeployment-patch.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-c2-nodepool0" }, + { "op": "replace", "path": "/spec/template/spec/bootstrap/configRef/name", "value": "usw2-c2-nodepool0" }, + { "op": "replace", "path": "/spec/template/spec/infrastructureRef/name", "value": "usw2-c2-nodepool0" } +]