From fa6604ab07a0f31d2f85b66be7bca44e1832540b Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Fri, 1 Nov 2019 10:49:49 -0600 Subject: [PATCH 01/10] Add basic structure and files Add basic directory structure and files for scenario on using kustomize with Cluster API Signed-off-by: Scott Lowe --- kubernetes/capi-kustomize/README.md | 3 ++ kubernetes/capi-kustomize/base/cluster.yaml | 21 ++++++++ .../capi-kustomize/base/controlplane.yaml | 46 ++++++++++++++++ .../capi-kustomize/base/kustomization.yaml | 7 +++ kubernetes/capi-kustomize/base/workers.yaml | 53 +++++++++++++++++++ .../overlays/use2-cluster1/kustomization.yaml | 5 ++ .../overlays/usw2-cluster1/kustomization.yaml | 5 ++ .../overlays/usw2-cluster2/kustomization.yaml | 5 ++ 8 files changed, 145 insertions(+) create mode 100644 kubernetes/capi-kustomize/README.md create mode 100644 kubernetes/capi-kustomize/base/cluster.yaml create mode 100644 kubernetes/capi-kustomize/base/controlplane.yaml create mode 100644 kubernetes/capi-kustomize/base/kustomization.yaml create mode 100644 kubernetes/capi-kustomize/base/workers.yaml create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/kustomization.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster2/kustomization.yaml diff --git a/kubernetes/capi-kustomize/README.md b/kubernetes/capi-kustomize/README.md new file mode 100644 index 0000000..bfc6a28 --- /dev/null +++ b/kubernetes/capi-kustomize/README.md @@ -0,0 +1,3 @@ +# Using Kustomize with Cluster API + +These files were created as examples to accompany [this blog post](https://blog.scottlowe.org/2019/11/04/using-kustomize-with-cluster-api-manifests/) on using `kustomize` with Cluster API (CAPI) manifests. diff --git a/kubernetes/capi-kustomize/base/cluster.yaml b/kubernetes/capi-kustomize/base/cluster.yaml new file mode 100644 index 0000000..73618d9 --- /dev/null +++ b/kubernetes/capi-kustomize/base/cluster.yaml @@ -0,0 +1,21 @@ +--- +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: Cluster +metadata: + name: capi-quickstart +spec: + clusterNetwork: + pods: + cidrBlocks: ["192.168.0.0/16"] + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 + kind: AWSCluster + name: capi-quickstart +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSCluster +metadata: + name: capi-quickstart +spec: + region: us-east-1 + sshKeyName: default diff --git a/kubernetes/capi-kustomize/base/controlplane.yaml b/kubernetes/capi-kustomize/base/controlplane.yaml new file mode 100644 index 0000000..2fdde3a --- /dev/null +++ b/kubernetes/capi-kustomize/base/controlplane.yaml @@ -0,0 +1,46 @@ +--- +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: Machine +metadata: + name: capi-quickstart-controlplane-0 + labels: + cluster.x-k8s.io/control-plane: "true" + cluster.x-k8s.io/cluster-name: "capi-quickstart" +spec: + version: v1.15.3 + bootstrap: + configRef: + apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 + kind: KubeadmConfig + name: capi-quickstart-controlplane-0 + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 + kind: AWSMachine + name: capi-quickstart-controlplane-0 +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachine +metadata: + name: capi-quickstart-controlplane-0 +spec: + instanceType: t3.large + iamInstanceProfile: "controllers.cluster-api-provider-aws.sigs.k8s.io" + sshKeyName: default +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 +kind: KubeadmConfig +metadata: + name: capi-quickstart-controlplane-0 +spec: + initConfiguration: + nodeRegistration: + name: '{{ ds.meta_data.hostname }}' + kubeletExtraArgs: + cloud-provider: aws + clusterConfiguration: + apiServer: + extraArgs: + cloud-provider: aws + controllerManager: + extraArgs: + cloud-provider: aws diff --git a/kubernetes/capi-kustomize/base/kustomization.yaml b/kubernetes/capi-kustomize/base/kustomization.yaml new file mode 100644 index 0000000..8c5ad0d --- /dev/null +++ b/kubernetes/capi-kustomize/base/kustomization.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - cluster.yaml + - controlplane.yaml + - workers.yaml diff --git a/kubernetes/capi-kustomize/base/workers.yaml b/kubernetes/capi-kustomize/base/workers.yaml new file mode 100644 index 0000000..cbf5042 --- /dev/null +++ b/kubernetes/capi-kustomize/base/workers.yaml @@ -0,0 +1,53 @@ +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: MachineDeployment +metadata: + name: capi-quickstart-worker + labels: + cluster.x-k8s.io/cluster-name: capi-quickstart + nodepool: nodepool-0 +spec: + replicas: 1 + selector: + matchLabels: + cluster.x-k8s.io/cluster-name: capi-quickstart + nodepool: nodepool-0 + template: + metadata: + labels: + cluster.x-k8s.io/cluster-name: capi-quickstart + nodepool: nodepool-0 + spec: + version: v1.15.3 + bootstrap: + configRef: + name: capi-quickstart-worker + apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 + kind: KubeadmConfigTemplate + infrastructureRef: + name: capi-quickstart-worker + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 + kind: AWSMachineTemplate +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachineTemplate +metadata: + name: capi-quickstart-worker +spec: + template: + spec: + instanceType: t3.large + iamInstanceProfile: "nodes.cluster-api-provider-aws.sigs.k8s.io" + sshKeyName: default +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 +kind: KubeadmConfigTemplate +metadata: + name: capi-quickstart-worker +spec: + template: + spec: + joinConfiguration: + nodeRegistration: + name: '{{ ds.meta_data.hostname }}' + kubeletExtraArgs: + cloud-provider: aws diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/kustomization.yaml b/kubernetes/capi-kustomize/overlays/use2-cluster1/kustomization.yaml new file mode 100644 index 0000000..c12b156 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/kustomization.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml new file mode 100644 index 0000000..c12b156 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster2/kustomization.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster2/kustomization.yaml new file mode 100644 index 0000000..c12b156 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster2/kustomization.yaml @@ -0,0 +1,5 @@ +--- +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- ../../base From 9f11f45907fb3ada370f6b300efbb490e949d996 Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Fri, 1 Nov 2019 19:00:03 -0400 Subject: [PATCH 02/10] Add first round of kustomize manifests Add first round of kustomize manifests for usw2-cluster1 Signed-off-by: Scott Lowe --- .../usw2-cluster1/cluster-details.yaml | 8 ++++++++ .../overlays/usw2-cluster1/kustomization.yaml | 20 +++++++++++++++++++ .../overlays/usw2-cluster1/name-patch.json | 3 +++ 3 files changed, 31 insertions(+) create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-details.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/name-patch.json diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-details.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-details.yaml new file mode 100644 index 0000000..5a9bca4 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-details.yaml @@ -0,0 +1,8 @@ +--- +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/kustomization.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml index c12b156..94858cc 100644 --- a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml @@ -3,3 +3,23 @@ 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: name-patch.json + - target: + group: infrastructure.cluster.x-k8s.io + version: v1alpha2 + kind: AWSCluster + name: capi-quickstart + path: name-patch.json +patches: + - target: + group: infrastructure.cluster.x-k8s.io + version: v1alpha2 + kind: AWSCluster + name: capi-quickstart + path: cluster-details.yaml diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/name-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/name-patch.json new file mode 100644 index 0000000..d789bac --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/name-patch.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster-1" } +] From be2256cc15bf06db981200b1c33ce31aefaaa567 Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Sat, 2 Nov 2019 00:08:44 -0400 Subject: [PATCH 03/10] Add more kustomization patches Add more patches for kustomize for use with Cluster API Signed-off-by: Scott Lowe --- ...er-details.yaml => awscluster-details.yaml} | 0 ...e-patch.json => awscluster-name-patch.json} | 0 .../usw2-cluster1/cluster-name-patch.json | 4 ++++ .../overlays/usw2-cluster1/kustomization.yaml | 18 +++++++++++++++--- .../overlays/usw2-cluster1/machine-labels.yaml | 7 +++++++ .../machinedeployment-labels.yaml | 15 +++++++++++++++ 6 files changed, 41 insertions(+), 3 deletions(-) rename kubernetes/capi-kustomize/overlays/usw2-cluster1/{cluster-details.yaml => awscluster-details.yaml} (100%) rename kubernetes/capi-kustomize/overlays/usw2-cluster1/{name-patch.json => awscluster-name-patch.json} (100%) create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-name-patch.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-labels.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-details.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-details.yaml similarity index 100% rename from kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-details.yaml rename to kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-details.yaml diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/name-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-name-patch.json similarity index 100% rename from kubernetes/capi-kustomize/overlays/usw2-cluster1/name-patch.json rename to kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-name-patch.json diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-name-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-name-patch.json new file mode 100644 index 0000000..19c2579 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-name-patch.json @@ -0,0 +1,4 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster-1" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "usw2-cluster-1" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml index 94858cc..2ebae4e 100644 --- a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml @@ -9,17 +9,29 @@ patchesJson6902: version: v1alpha2 kind: Cluster name: capi-quickstart - path: name-patch.json + path: cluster-name-patch.json - target: group: infrastructure.cluster.x-k8s.io version: v1alpha2 kind: AWSCluster name: capi-quickstart - path: name-patch.json + path: awscluster-name-patch.json patches: - target: group: infrastructure.cluster.x-k8s.io version: v1alpha2 kind: AWSCluster name: capi-quickstart - path: cluster-details.yaml + path: awscluster-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 diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-labels.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-labels.yaml new file mode 100644 index 0000000..31df16a --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/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-cluster1" diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml new file mode 100644 index 0000000..fd67f0f --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machinedeployment-labels.yaml @@ -0,0 +1,15 @@ +--- +apiVersion: MachineDeployment +kind: MachineDeployment +metadata: + name: .* + labels: + cluster.x-k8s.io/cluster-name: "usw2-cluster1" +spec: + selector: + matchLabels: + cluster.x-k8s.io/cluster-name: "usw2-cluster1" + template: + metadata: + labels: + cluster.x-k8s.io/cluster-name: "usw2-cluster1" From bc4d45a00ebcae0cea8d481927ac16aff84a25ae Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Wed, 6 Nov 2019 09:59:39 +0100 Subject: [PATCH 04/10] Standardize filenames and add AWS patches Standardize filenames, especially for JSON patches. Add patches for fixing various AWS-specific resource details. Signed-off-by: Scott Lowe --- ...-patch.json => awscluster-patch-name.json} | 0 .../usw2-cluster1/awsmachine-details.yaml | 9 ++ .../usw2-cluster1/awsmachine-patch-name.json | 3 + ...ame-patch.json => cluster-patch-name.json} | 0 .../overlays/usw2-cluster1/kustomization.yaml | 22 +++- .../usw2-cluster1/machine-patch-name.json | 5 + .../overlays/usw2-cluster1/output.yaml | 121 ++++++++++++++++++ 7 files changed, 158 insertions(+), 2 deletions(-) rename kubernetes/capi-kustomize/overlays/usw2-cluster1/{awscluster-name-patch.json => awscluster-patch-name.json} (100%) create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-details.yaml create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-patch-name.json rename kubernetes/capi-kustomize/overlays/usw2-cluster1/{cluster-name-patch.json => cluster-patch-name.json} (100%) create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/output.yaml diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-name-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch-name.json similarity index 100% rename from kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-name-patch.json rename to kubernetes/capi-kustomize/overlays/usw2-cluster1/awscluster-patch-name.json diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-details.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-details.yaml new file mode 100644 index 0000000..b047848 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/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-cluster1/awsmachine-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-patch-name.json new file mode 100644 index 0000000..9f294f8 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/awsmachine-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster1-cp0" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-name-patch.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-patch-name.json similarity index 100% rename from kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-name-patch.json rename to kubernetes/capi-kustomize/overlays/usw2-cluster1/cluster-patch-name.json diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml index 2ebae4e..c8e962e 100644 --- a/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/kustomization.yaml @@ -9,13 +9,25 @@ patchesJson6902: version: v1alpha2 kind: Cluster name: capi-quickstart - path: cluster-name-patch.json + path: cluster-patch-name.json - target: group: infrastructure.cluster.x-k8s.io version: v1alpha2 kind: AWSCluster name: capi-quickstart - path: awscluster-name-patch.json + path: awscluster-patch-name.json + - target: + group: cluster.x-k8s.io + version: v1alpha2 + kind: Machine + name: capi-quickstart-controlplane-0 + path: machine-patch-name.json + - target: + group: infrastructure.cluster.x-k8s.io + version: v1alpha2 + kind: AWSMachine + name: capi-quickstart-controlplane-0 + path: awsmachine-patch-name.json patches: - target: group: infrastructure.cluster.x-k8s.io @@ -35,3 +47,9 @@ patches: 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-cluster1/machine-patch-name.json b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-patch-name.json new file mode 100644 index 0000000..74b3011 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/machine-patch-name.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "usw2-cluster1-cp0" }, + { "op": "replace", "path": "/spec/bootstrap/configRef/name", "value": "usw2-cluster1-cp0" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "usw2-cluster1-cp0" } +] diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/output.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/output.yaml new file mode 100644 index 0000000..75b45ea --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/usw2-cluster1/output.yaml @@ -0,0 +1,121 @@ +apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 +kind: KubeadmConfig +metadata: + name: capi-quickstart-controlplane-0 +spec: + clusterConfiguration: + apiServer: + extraArgs: + cloud-provider: aws + controllerManager: + extraArgs: + cloud-provider: aws + initConfiguration: + nodeRegistration: + kubeletExtraArgs: + cloud-provider: aws + name: '{{ ds.meta_data.hostname }}' +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 +kind: KubeadmConfigTemplate +metadata: + name: capi-quickstart-worker +spec: + template: + spec: + joinConfiguration: + nodeRegistration: + kubeletExtraArgs: + cloud-provider: aws + name: '{{ ds.meta_data.hostname }}' +--- +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: Cluster +metadata: + name: usw2-cluster-1 +spec: + clusterNetwork: + pods: + cidrBlocks: + - 192.168.0.0/16 + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 + kind: AWSCluster + name: usw2-cluster-1 +--- +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: Machine +metadata: + labels: + cluster.x-k8s.io/cluster-name: usw2-cluster1 + cluster.x-k8s.io/control-plane: "true" + name: usw2-cluster1-cp0 +spec: + bootstrap: + configRef: + apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 + kind: KubeadmConfig + name: usw2-cluster1-cp0 + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 + kind: AWSMachine + name: usw2-cluster1-cp0 + version: v1.15.3 +--- +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: MachineDeployment +metadata: + labels: + cluster.x-k8s.io/cluster-name: usw2-cluster1 + nodepool: nodepool-0 + name: capi-quickstart-worker +spec: + replicas: 1 + selector: + matchLabels: + cluster.x-k8s.io/cluster-name: usw2-cluster1 + nodepool: nodepool-0 + template: + metadata: + labels: + cluster.x-k8s.io/cluster-name: usw2-cluster1 + nodepool: nodepool-0 + spec: + bootstrap: + configRef: + apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 + kind: KubeadmConfigTemplate + name: capi-quickstart-worker + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 + kind: AWSMachineTemplate + name: capi-quickstart-worker + version: v1.15.3 +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSCluster +metadata: + name: usw2-cluster-1 +spec: + region: us-west-2 + sshKeyName: usw2_rsa_key +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachine +metadata: + name: usw2-cluster1-cp0 +spec: + iamInstanceProfile: controllers.cluster-api-provider-aws.sigs.k8s.io + instanceType: t3.large + sshKeyName: usw2_rsa_key +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachineTemplate +metadata: + name: capi-quickstart-worker +spec: + template: + spec: + iamInstanceProfile: nodes.cluster-api-provider-aws.sigs.k8s.io + instanceType: t3.large + sshKeyName: default From 0989c1d590084bdabd38da258dbaafd121e21cf2 Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Tue, 12 Nov 2019 09:19:05 +0900 Subject: [PATCH 05/10] Update base configuration Update region in base configuration to address majority of use cases Signed-off-by: Scott Lowe --- kubernetes/capi-kustomize/base/cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/capi-kustomize/base/cluster.yaml b/kubernetes/capi-kustomize/base/cluster.yaml index 73618d9..4198dce 100644 --- a/kubernetes/capi-kustomize/base/cluster.yaml +++ b/kubernetes/capi-kustomize/base/cluster.yaml @@ -17,5 +17,5 @@ kind: AWSCluster metadata: name: capi-quickstart spec: - region: us-east-1 + region: us-west-2 sshKeyName: default From 36fd1925309cb2629c33f39acbb7ac7be71fff87 Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Tue, 12 Nov 2019 20:50:21 +0900 Subject: [PATCH 06/10] Finalize base configuration Update control plane and worker manifests Signed-off-by: Scott Lowe --- .../capi-kustomize/base/controlplane.yaml | 94 ++++++++++++++++++- kubernetes/capi-kustomize/base/workers.yaml | 4 +- 2 files changed, 95 insertions(+), 3 deletions(-) diff --git a/kubernetes/capi-kustomize/base/controlplane.yaml b/kubernetes/capi-kustomize/base/controlplane.yaml index 2fdde3a..7fcfd79 100644 --- a/kubernetes/capi-kustomize/base/controlplane.yaml +++ b/kubernetes/capi-kustomize/base/controlplane.yaml @@ -23,7 +23,7 @@ kind: AWSMachine metadata: name: capi-quickstart-controlplane-0 spec: - instanceType: t3.large + instanceType: m5.large iamInstanceProfile: "controllers.cluster-api-provider-aws.sigs.k8s.io" sshKeyName: default --- @@ -44,3 +44,95 @@ spec: controllerManager: extraArgs: cloud-provider: aws +--- +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: Machine +metadata: + name: capi-quickstart-controlplane-1 + labels: + cluster.x-k8s.io/control-plane: "true" + cluster.x-k8s.io/cluster-name: "capi-quickstart" +spec: + version: v1.15.3 + bootstrap: + configRef: + apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 + kind: KubeadmConfig + name: capi-quickstart-controlplane-1 + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 + kind: AWSMachine + name: capi-quickstart-controlplane-1 +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachine +metadata: + name: capi-quickstart-controlplane-1 +spec: + instanceType: m5.large + iamInstanceProfile: "controllers.cluster-api-provider-aws.sigs.k8s.io" + sshKeyName: default +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 +kind: KubeadmConfig +metadata: + name: capi-quickstart-controlplane-1 +spec: + initConfiguration: + nodeRegistration: + name: '{{ ds.meta_data.hostname }}' + kubeletExtraArgs: + cloud-provider: aws + clusterConfiguration: + apiServer: + extraArgs: + cloud-provider: aws + controllerManager: + extraArgs: + cloud-provider: aws +--- +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: Machine +metadata: + name: capi-quickstart-controlplane-2 + labels: + cluster.x-k8s.io/control-plane: "true" + cluster.x-k8s.io/cluster-name: "capi-quickstart" +spec: + version: v1.15.3 + bootstrap: + configRef: + apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 + kind: KubeadmConfig + name: capi-quickstart-controlplane-2 + infrastructureRef: + apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 + kind: AWSMachine + name: capi-quickstart-controlplane-2 +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachine +metadata: + name: capi-quickstart-controlplane-2 +spec: + instanceType: m5.large + iamInstanceProfile: "controllers.cluster-api-provider-aws.sigs.k8s.io" + sshKeyName: default +--- +apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 +kind: KubeadmConfig +metadata: + name: capi-quickstart-controlplane-2 +spec: + initConfiguration: + nodeRegistration: + name: '{{ ds.meta_data.hostname }}' + kubeletExtraArgs: + cloud-provider: aws + clusterConfiguration: + apiServer: + extraArgs: + cloud-provider: aws + controllerManager: + extraArgs: + cloud-provider: aws diff --git a/kubernetes/capi-kustomize/base/workers.yaml b/kubernetes/capi-kustomize/base/workers.yaml index cbf5042..782b787 100644 --- a/kubernetes/capi-kustomize/base/workers.yaml +++ b/kubernetes/capi-kustomize/base/workers.yaml @@ -6,7 +6,7 @@ metadata: cluster.x-k8s.io/cluster-name: capi-quickstart nodepool: nodepool-0 spec: - replicas: 1 + replicas: 3 selector: matchLabels: cluster.x-k8s.io/cluster-name: capi-quickstart @@ -35,7 +35,7 @@ metadata: spec: template: spec: - instanceType: t3.large + instanceType: m5.large iamInstanceProfile: "nodes.cluster-api-provider-aws.sigs.k8s.io" sshKeyName: default --- From 48aa23648840d35682984c923fe36a5e57b4efdd Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Tue, 12 Nov 2019 21:57:18 +0900 Subject: [PATCH 07/10] 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" } +] From a4e8ed93c1ef2ec12bff895407d96bd813ca65e1 Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Tue, 12 Nov 2019 21:58:30 +0900 Subject: [PATCH 08/10] Remove kustomize output Remove the kustomize output file Signed-off-by: Scott Lowe --- .../overlays/usw2-cluster1/output.yaml | 121 ------------------ 1 file changed, 121 deletions(-) delete mode 100644 kubernetes/capi-kustomize/overlays/usw2-cluster1/output.yaml diff --git a/kubernetes/capi-kustomize/overlays/usw2-cluster1/output.yaml b/kubernetes/capi-kustomize/overlays/usw2-cluster1/output.yaml deleted file mode 100644 index 75b45ea..0000000 --- a/kubernetes/capi-kustomize/overlays/usw2-cluster1/output.yaml +++ /dev/null @@ -1,121 +0,0 @@ -apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 -kind: KubeadmConfig -metadata: - name: capi-quickstart-controlplane-0 -spec: - clusterConfiguration: - apiServer: - extraArgs: - cloud-provider: aws - controllerManager: - extraArgs: - cloud-provider: aws - initConfiguration: - nodeRegistration: - kubeletExtraArgs: - cloud-provider: aws - name: '{{ ds.meta_data.hostname }}' ---- -apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 -kind: KubeadmConfigTemplate -metadata: - name: capi-quickstart-worker -spec: - template: - spec: - joinConfiguration: - nodeRegistration: - kubeletExtraArgs: - cloud-provider: aws - name: '{{ ds.meta_data.hostname }}' ---- -apiVersion: cluster.x-k8s.io/v1alpha2 -kind: Cluster -metadata: - name: usw2-cluster-1 -spec: - clusterNetwork: - pods: - cidrBlocks: - - 192.168.0.0/16 - infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 - kind: AWSCluster - name: usw2-cluster-1 ---- -apiVersion: cluster.x-k8s.io/v1alpha2 -kind: Machine -metadata: - labels: - cluster.x-k8s.io/cluster-name: usw2-cluster1 - cluster.x-k8s.io/control-plane: "true" - name: usw2-cluster1-cp0 -spec: - bootstrap: - configRef: - apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 - kind: KubeadmConfig - name: usw2-cluster1-cp0 - infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 - kind: AWSMachine - name: usw2-cluster1-cp0 - version: v1.15.3 ---- -apiVersion: cluster.x-k8s.io/v1alpha2 -kind: MachineDeployment -metadata: - labels: - cluster.x-k8s.io/cluster-name: usw2-cluster1 - nodepool: nodepool-0 - name: capi-quickstart-worker -spec: - replicas: 1 - selector: - matchLabels: - cluster.x-k8s.io/cluster-name: usw2-cluster1 - nodepool: nodepool-0 - template: - metadata: - labels: - cluster.x-k8s.io/cluster-name: usw2-cluster1 - nodepool: nodepool-0 - spec: - bootstrap: - configRef: - apiVersion: bootstrap.cluster.x-k8s.io/v1alpha2 - kind: KubeadmConfigTemplate - name: capi-quickstart-worker - infrastructureRef: - apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 - kind: AWSMachineTemplate - name: capi-quickstart-worker - version: v1.15.3 ---- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 -kind: AWSCluster -metadata: - name: usw2-cluster-1 -spec: - region: us-west-2 - sshKeyName: usw2_rsa_key ---- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 -kind: AWSMachine -metadata: - name: usw2-cluster1-cp0 -spec: - iamInstanceProfile: controllers.cluster-api-provider-aws.sigs.k8s.io - instanceType: t3.large - sshKeyName: usw2_rsa_key ---- -apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 -kind: AWSMachineTemplate -metadata: - name: capi-quickstart-worker -spec: - template: - spec: - iamInstanceProfile: nodes.cluster-api-provider-aws.sigs.k8s.io - instanceType: t3.large - sshKeyName: default From 07381c9d98955a926b228fa39802715a9b0fac2c Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Wed, 13 Nov 2019 11:06:31 +0900 Subject: [PATCH 09/10] 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" } +] From cf7e4cbc0133eadbfbf8b69a4943d0d9455948f8 Mon Sep 17 00:00:00 2001 From: Scott Lowe Date: Wed, 13 Nov 2019 11:16:00 +0900 Subject: [PATCH 10/10] Add overlay for us-east-2 cluster Add kustomization.yaml and overlay patches for cluster in us-east-2 Signed-off-by: Scott Lowe --- .../use2-cluster1/awscluster-patch.json | 5 + .../awsmachine-cp0-patch-name.json | 3 + .../awsmachine-cp1-patch-name.json | 3 + .../awsmachine-cp2-patch-name.json | 3 + .../use2-cluster1/awsmachine-details.yaml | 9 ++ .../awsmachinetemplate-details.yaml | 11 ++ .../awsmachinetemplate-patch-name.json | 3 + .../overlays/use2-cluster1/cluster-patch.json | 4 + .../kubeadmconfigtemplate-patch-name.json | 3 + .../overlays/use2-cluster1/kustomization.yaml | 110 ++++++++++++++++++ .../use2-cluster1/machine-cp0-patch-name.json | 5 + .../use2-cluster1/machine-cp1-patch-name.json | 5 + .../use2-cluster1/machine-cp2-patch-name.json | 5 + .../use2-cluster1/machine-labels.yaml | 7 ++ .../machinedeployment-labels.yaml | 18 +++ .../machinedeployment-patch.json | 5 + 16 files changed, 199 insertions(+) create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/awscluster-patch.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp0-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp1-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp2-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-details.yaml create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachinetemplate-details.yaml create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachinetemplate-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/cluster-patch.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/kubeadmconfigtemplate-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp0-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp1-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp2-patch-name.json create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/machine-labels.yaml create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/machinedeployment-labels.yaml create mode 100644 kubernetes/capi-kustomize/overlays/use2-cluster1/machinedeployment-patch.json diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/awscluster-patch.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/awscluster-patch.json new file mode 100644 index 0000000..7be8cf2 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/awscluster-patch.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-cluster-1" }, + { "op": "replace", "path": "/spec/region", "value": "us-east-2" }, + { "op": "replace", "path": "/spec/sshKeyName", "value": "use2_rsa_key" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp0-patch-name.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp0-patch-name.json new file mode 100644 index 0000000..1492d3f --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp0-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-cluster1-cp0" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp1-patch-name.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp1-patch-name.json new file mode 100644 index 0000000..ff53679 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp1-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-cluster1-cp1" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp2-patch-name.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp2-patch-name.json new file mode 100644 index 0000000..dc914a3 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-cp2-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-cluster1-cp2" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-details.yaml b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-details.yaml new file mode 100644 index 0000000..68f5048 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachine-details.yaml @@ -0,0 +1,9 @@ +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachine +metadata: + name: .* +spec: + sshKeyName: use2_rsa_key + # Uncomment following line to change instance type + #instanceType: m5.xlarge diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachinetemplate-details.yaml b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachinetemplate-details.yaml new file mode 100644 index 0000000..80f3c83 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachinetemplate-details.yaml @@ -0,0 +1,11 @@ +--- +apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 +kind: AWSMachineTemplate +metadata: + name: .* +spec: + template: + spec: + sshKeyName: use2_rsa_key + # Uncomment following line to change instance type + #instanceType: m5.xlarge diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachinetemplate-patch-name.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachinetemplate-patch-name.json new file mode 100644 index 0000000..55d174b --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/awsmachinetemplate-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-c1-nodepool0" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/cluster-patch.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/cluster-patch.json new file mode 100644 index 0000000..5eb8885 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/cluster-patch.json @@ -0,0 +1,4 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-cluster-1" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "use2-cluster-1" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/kubeadmconfigtemplate-patch-name.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/kubeadmconfigtemplate-patch-name.json new file mode 100644 index 0000000..55d174b --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/kubeadmconfigtemplate-patch-name.json @@ -0,0 +1,3 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-c1-nodepool0" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/kustomization.yaml b/kubernetes/capi-kustomize/overlays/use2-cluster1/kustomization.yaml index c12b156..ef2ca4a 100644 --- a/kubernetes/capi-kustomize/overlays/use2-cluster1/kustomization.yaml +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/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/use2-cluster1/machine-cp0-patch-name.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp0-patch-name.json new file mode 100644 index 0000000..a0bb57d --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp0-patch-name.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-cluster1-cp0" }, + { "op": "replace", "path": "/spec/bootstrap/configRef/name", "value": "use2-cluster1-cp0" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "use2-cluster1-cp0" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp1-patch-name.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp1-patch-name.json new file mode 100644 index 0000000..d46f27b --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp1-patch-name.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-cluster1-cp1" }, + { "op": "replace", "path": "/spec/bootstrap/configRef/name", "value": "use2-cluster1-cp1" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "use2-cluster1-cp1" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp2-patch-name.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp2-patch-name.json new file mode 100644 index 0000000..2b749e2 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-cp2-patch-name.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-cluster1-cp2" }, + { "op": "replace", "path": "/spec/bootstrap/configRef/name", "value": "use2-cluster1-cp2" }, + { "op": "replace", "path": "/spec/infrastructureRef/name", "value": "use2-cluster1-cp2" } +] diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-labels.yaml b/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-labels.yaml new file mode 100644 index 0000000..2c4250b --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/machine-labels.yaml @@ -0,0 +1,7 @@ +--- +apiVersion: cluster.x-k8s.io/v1alpha2 +kind: Machine +metadata: + name: .* + labels: + cluster.x-k8s.io/cluster-name: "use2-cluster1" diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/machinedeployment-labels.yaml b/kubernetes/capi-kustomize/overlays/use2-cluster1/machinedeployment-labels.yaml new file mode 100644 index 0000000..0faee99 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/machinedeployment-labels.yaml @@ -0,0 +1,18 @@ +--- +apiVersion: MachineDeployment +kind: MachineDeployment +metadata: + name: .* + labels: + cluster.x-k8s.io/cluster-name: "use2-cluster1" + nodepool: "use2-c1-nodepool0" +spec: + selector: + matchLabels: + cluster.x-k8s.io/cluster-name: "use2-cluster1" + nodepool: "use2-c1-nodepool0" + template: + metadata: + labels: + cluster.x-k8s.io/cluster-name: "use2-cluster1" + nodepool: "use2-c1-nodepool0" diff --git a/kubernetes/capi-kustomize/overlays/use2-cluster1/machinedeployment-patch.json b/kubernetes/capi-kustomize/overlays/use2-cluster1/machinedeployment-patch.json new file mode 100644 index 0000000..a476008 --- /dev/null +++ b/kubernetes/capi-kustomize/overlays/use2-cluster1/machinedeployment-patch.json @@ -0,0 +1,5 @@ +[ + { "op": "replace", "path": "/metadata/name", "value": "use2-c1-nodepool0" }, + { "op": "replace", "path": "/spec/template/spec/bootstrap/configRef/name", "value": "use2-c1-nodepool0" }, + { "op": "replace", "path": "/spec/template/spec/infrastructureRef/name", "value": "use2-c1-nodepool0" } +]