From 4edbaebf87b5ebd358270127d57685e21a116320 Mon Sep 17 00:00:00 2001 From: Julio Rivera Date: Thu, 24 Oct 2019 01:43:12 -0500 Subject: [PATCH] Removes kustomize from kubeadm init (#222) This commit drops kustomize support from kubeadm config file. Signed-off-by: Rivera Gonzalez, Julio C --- clr-k8s-examples/create_stack.sh | 16 ++++++++++------ .../{kubeadm/base => }/kubeadm.yaml | 6 ------ .../kubeadm/base/kustomization.yaml | 2 -- .../kubeadm/high-pod-count/cluster-config.json | 3 --- .../kubeadm/high-pod-count/kubelet-config.json | 4 ---- .../kubeadm/high-pod-count/kustomization.yaml | 17 ----------------- 6 files changed, 10 insertions(+), 38 deletions(-) rename clr-k8s-examples/{kubeadm/base => }/kubeadm.yaml (83%) delete mode 100644 clr-k8s-examples/kubeadm/base/kustomization.yaml delete mode 100644 clr-k8s-examples/kubeadm/high-pod-count/cluster-config.json delete mode 100644 clr-k8s-examples/kubeadm/high-pod-count/kubelet-config.json delete mode 100644 clr-k8s-examples/kubeadm/high-pod-count/kustomization.yaml diff --git a/clr-k8s-examples/create_stack.sh b/clr-k8s-examples/create_stack.sh index d6d3ebe..4ce8282 100755 --- a/clr-k8s-examples/create_stack.sh +++ b/clr-k8s-examples/create_stack.sh @@ -45,17 +45,21 @@ trap finish EXIT function cluster_init() { # Config replacements if ! [ -z ${TOKEN} ]; then - sed -i "/InitConfiguration/a bootstrapTokens:\\n- token: ${TOKEN}" ./kubeadm/base/kubeadm.yaml + sed -i "/InitConfiguration/a bootstrapTokens:\\n- token: ${TOKEN}" ./kubeadm.yaml fi if ! [ -z ${MASTER_IP} ]; then - sed -i "/InitConfiguration/a localAPIEndpoint:\\n advertiseAddress: ${MASTER_IP}" ./kubeadm/base/kubeadm.yaml + sed -i "/InitConfiguration/a localAPIEndpoint:\\n advertiseAddress: ${MASTER_IP}" ./kubeadm.yaml fi - if [[ -n "$K8S_VER" && $(grep -c kubernetesVersion ./kubeadm/base/kubeadm.yaml) -eq 0 ]]; then - sed -i "s/ClusterConfiguration/ClusterConfiguration\nkubernetesVersion: ${K8S_VER}/g" ./kubeadm/base/kubeadm.yaml + if [[ -n "$K8S_VER" && $(grep -c kubernetesVersion ./kubeadm.yaml) -eq 0 ]]; then + sed -i "s/ClusterConfiguration/ClusterConfiguration\nkubernetesVersion: ${K8S_VER}/g" ./kubeadm.yaml fi # Config patches if [[ -n "${HIGH_POD_COUNT}" ]]; then - echo "$(kubectl kustomize ./kubeadm/high-pod-count/)" > ./kubeadm/base/kubeadm.yaml + # increase limits in kubelet + sed -i "/KubeletConfiguration/a maxOpenFiles\: 1048576" ./kubeadm.yaml + sed -i "/KubeletConfiguration/a maxPods\: 5000" ./kubeadm.yaml + # increase the address range per node + sed -i "/ClusterConfiguration/a controllerManager:\\n extraArgs:\\n node-cidr-mask-size: \"20\"" ./kubeadm.yaml fi #This only works with kubernetes 1.12+. The kubeadm.yaml is setup #to enable the RuntimeClass featuregate @@ -63,7 +67,7 @@ function cluster_init() { echo "/var/lib/etcd exists! skipping init." return fi - sudo -E kubeadm init --config=./kubeadm/base/kubeadm.yaml + sudo -E kubeadm init --config=./kubeadm.yaml rm -rf "${HOME}/.kube" mkdir -p "${HOME}/.kube" diff --git a/clr-k8s-examples/kubeadm/base/kubeadm.yaml b/clr-k8s-examples/kubeadm.yaml similarity index 83% rename from clr-k8s-examples/kubeadm/base/kubeadm.yaml rename to clr-k8s-examples/kubeadm.yaml index af6661e..2888eba 100644 --- a/clr-k8s-examples/kubeadm/base/kubeadm.yaml +++ b/clr-k8s-examples/kubeadm.yaml @@ -1,12 +1,8 @@ apiVersion: kubeadm.k8s.io/v1beta1 kind: InitConfiguration -metadata: - name: init-config --- apiVersion: kubelet.config.k8s.io/v1beta1 kind: KubeletConfiguration -metadata: - name: kubelet-config cgroupDriver: systemd # Allowing for CPU pinning and isolation in case of guaranteed QoS class cpuManagerPolicy: static @@ -19,8 +15,6 @@ kubeReserved: --- apiVersion: kubeadm.k8s.io/v1beta1 kind: ClusterConfiguration -metadata: - name: cluster-config networking: dnsDomain: cluster.local podSubnet: 10.244.0.0/16 diff --git a/clr-k8s-examples/kubeadm/base/kustomization.yaml b/clr-k8s-examples/kubeadm/base/kustomization.yaml deleted file mode 100644 index ea44d70..0000000 --- a/clr-k8s-examples/kubeadm/base/kustomization.yaml +++ /dev/null @@ -1,2 +0,0 @@ -resources: -- kubeadm.yaml diff --git a/clr-k8s-examples/kubeadm/high-pod-count/cluster-config.json b/clr-k8s-examples/kubeadm/high-pod-count/cluster-config.json deleted file mode 100644 index 6f63200..0000000 --- a/clr-k8s-examples/kubeadm/high-pod-count/cluster-config.json +++ /dev/null @@ -1,3 +0,0 @@ -[ - {"op": "add", "path": "/controllerManager", "value": {"extraArgs": {"node-cidr-mask-size": "20"}}} -] diff --git a/clr-k8s-examples/kubeadm/high-pod-count/kubelet-config.json b/clr-k8s-examples/kubeadm/high-pod-count/kubelet-config.json deleted file mode 100644 index 75e8a16..0000000 --- a/clr-k8s-examples/kubeadm/high-pod-count/kubelet-config.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - {"op": "add", "path": "/maxOpenFiles", "value": 1048576}, - {"op": "add", "path": "/maxPods", "value": 5000} -] diff --git a/clr-k8s-examples/kubeadm/high-pod-count/kustomization.yaml b/clr-k8s-examples/kubeadm/high-pod-count/kustomization.yaml deleted file mode 100644 index a4c6b01..0000000 --- a/clr-k8s-examples/kubeadm/high-pod-count/kustomization.yaml +++ /dev/null @@ -1,17 +0,0 @@ -bases: -- ../base/ -patchesJson6902: -# increase limits in kubelet -- target: - group: kubelet.config.k8s.io - version: v1beta1 - kind: KubeletConfiguration - name: kubelet-config - path: kubelet-config.json -# increase the address range per node -- target: - group: kubeadm.k8s.io - version: v1beta1 - kind: ClusterConfiguration - name: cluster-config - path: cluster-config.json