From cfe0745cad80c7a3f2c9ff287560e9c2eeae6e8a Mon Sep 17 00:00:00 2001 From: Jan Chaloupka Date: Sat, 25 Aug 2018 00:59:30 +0200 Subject: [PATCH] Don't ask me, just it is --- examples/master-user-data.sh | 1 - examples/master-userdata.yaml | 28 ++++++++++++++-------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/examples/master-user-data.sh b/examples/master-user-data.sh index e08b43fcf4..c533684610 100755 --- a/examples/master-user-data.sh +++ b/examples/master-user-data.sh @@ -20,7 +20,6 @@ cat < /etc/default/kubelet KUBELET_KUBEADM_EXTRA_ARGS=--cgroup-driver=systemd EOF -# https://github.com/openshift/cluster-api-provider-aws/issues/30 echo '1' > /proc/sys/net/bridge/bridge-nf-call-iptables kubeadm init --apiserver-bind-port 8443 --token 2iqzqm.85bs0x6miyx1nm7l --apiserver-cert-extra-sans=\$(curl -s http://169.254.169.254/latest/meta-data/public-hostname) --apiserver-cert-extra-sans=\$(curl -s http://169.254.169.254/latest/meta-data/public-ipv4) --pod-network-cidr=192.168.0.0/16 -v 6 diff --git a/examples/master-userdata.yaml b/examples/master-userdata.yaml index f5a0e131b9..68923dae68 100644 --- a/examples/master-userdata.yaml +++ b/examples/master-userdata.yaml @@ -15,17 +15,17 @@ data: dW0vZG9jL3JwbS1wYWNrYWdlLWtleS5ncGcKZXhjbHVkZT1rdWJlKgpFT0YKc2V0ZW5mb3JjZSAw Cnl1bSBpbnN0YWxsIC15IGt1YmVsZXQga3ViZWFkbSBrdWJlY3RsIC0tZGlzYWJsZWV4Y2x1ZGVz PWt1YmVybmV0ZXMKCmNhdCA8PEVPRiA+IC9ldGMvZGVmYXVsdC9rdWJlbGV0CktVQkVMRVRfS1VC - RUFETV9FWFRSQV9BUkdTPS0tY2dyb3VwLWRyaXZlcj1zeXN0ZW1kCkVPRgoKIyBodHRwczovL2dp - dGh1Yi5jb20vb3BlbnNoaWZ0L2NsdXN0ZXItYXBpLXByb3ZpZGVyLWF3cy9pc3N1ZXMvMzAKZWNo - byAnMScgPiAvcHJvYy9zeXMvbmV0L2JyaWRnZS9icmlkZ2UtbmYtY2FsbC1pcHRhYmxlcwoKa3Vi - ZWFkbSBpbml0IC0tYXBpc2VydmVyLWJpbmQtcG9ydCA4NDQzIC0tdG9rZW4gMmlxenFtLjg1YnMw - eDZtaXl4MW5tN2wgLS1hcGlzZXJ2ZXItY2VydC1leHRyYS1zYW5zPVwkKGN1cmwgLXMgaHR0cDov - LzE2OS4yNTQuMTY5LjI1NC9sYXRlc3QvbWV0YS1kYXRhL3B1YmxpYy1ob3N0bmFtZSkgLS1hcGlz - ZXJ2ZXItY2VydC1leHRyYS1zYW5zPVwkKGN1cmwgLXMgaHR0cDovLzE2OS4yNTQuMTY5LjI1NC9s - YXRlc3QvbWV0YS1kYXRhL3B1YmxpYy1pcHY0KSAtLXBvZC1uZXR3b3JrLWNpZHI9MTkyLjE2OC4w - LjAvMTYgLXYgNgoKIyBFbmFibGUgbmV0d29ya2luZyBieSBkZWZhdWx0LgprdWJlY3RsIGFwcGx5 - IC1mIGh0dHBzOi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9jbG91ZG5hdGl2ZWxhYnMva3Vi - ZS1yb3V0ZXIvbWFzdGVyL2RhZW1vbnNldC9rdWJlYWRtLWt1YmVyb3V0ZXIueWFtbCAtLWt1YmVj - b25maWcgL2V0Yy9rdWJlcm5ldGVzL2FkbWluLmNvbmYKCm1rZGlyIC1wIC9yb290Ly5rdWJlCmNw - IC1pIC9ldGMva3ViZXJuZXRlcy9hZG1pbi5jb25mIC9yb290Ly5rdWJlL2NvbmZpZwpjaG93biAk - KGlkIC11KTokKGlkIC1nKSAvcm9vdC8ua3ViZS9jb25maWcKSEVSRURPQwoKYmFzaCAvcm9vdC91 + RUFETV9FWFRSQV9BUkdTPS0tY2dyb3VwLWRyaXZlcj1zeXN0ZW1kCkVPRgoKZWNobyAnMScgPiAv + cHJvYy9zeXMvbmV0L2JyaWRnZS9icmlkZ2UtbmYtY2FsbC1pcHRhYmxlcwoKa3ViZWFkbSBpbml0 + IC0tYXBpc2VydmVyLWJpbmQtcG9ydCA4NDQzIC0tdG9rZW4gMmlxenFtLjg1YnMweDZtaXl4MW5t + N2wgLS1hcGlzZXJ2ZXItY2VydC1leHRyYS1zYW5zPVwkKGN1cmwgLXMgaHR0cDovLzE2OS4yNTQu + MTY5LjI1NC9sYXRlc3QvbWV0YS1kYXRhL3B1YmxpYy1ob3N0bmFtZSkgLS1hcGlzZXJ2ZXItY2Vy + dC1leHRyYS1zYW5zPVwkKGN1cmwgLXMgaHR0cDovLzE2OS4yNTQuMTY5LjI1NC9sYXRlc3QvbWV0 + YS1kYXRhL3B1YmxpYy1pcHY0KSAtLXBvZC1uZXR3b3JrLWNpZHI9MTkyLjE2OC4wLjAvMTYgLXYg + NgoKIyBFbmFibGUgbmV0d29ya2luZyBieSBkZWZhdWx0LgprdWJlY3RsIGFwcGx5IC1mIGh0dHBz + Oi8vcmF3LmdpdGh1YnVzZXJjb250ZW50LmNvbS9jbG91ZG5hdGl2ZWxhYnMva3ViZS1yb3V0ZXIv + bWFzdGVyL2RhZW1vbnNldC9rdWJlYWRtLWt1YmVyb3V0ZXIueWFtbCAtLWt1YmVjb25maWcgL2V0 + Yy9rdWJlcm5ldGVzL2FkbWluLmNvbmYKCm1rZGlyIC1wIC9yb290Ly5rdWJlCmNwIC1pIC9ldGMv + a3ViZXJuZXRlcy9hZG1pbi5jb25mIC9yb290Ly5rdWJlL2NvbmZpZwpjaG93biAkKGlkIC11KTok + KGlkIC1nKSAvcm9vdC8ua3ViZS9jb25maWcKSEVSRURPQwoKYmFzaCAvcm9vdC91c2VyLWRhdGEu + c2ggPiAvcm9vdC91c2VyLWRhdGEubG9ncwo=