-
Notifications
You must be signed in to change notification settings - Fork 4.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Store terraform launchtemplate userdata in plaintext rather than b64 #9340
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
303 changes: 302 additions & 1 deletion
303
...r/data/aws_launch_template_master-us-test-1a.masters.additionalcidr.example.com_user_data
Large diffs are not rendered by default.
Oops, something went wrong.
303 changes: 302 additions & 1 deletion
303
...r/data/aws_launch_template_master-us-test-1b.masters.additionalcidr.example.com_user_data
Large diffs are not rendered by default.
Oops, something went wrong.
303 changes: 302 additions & 1 deletion
303
...r/data/aws_launch_template_master-us-test-1c.masters.additionalcidr.example.com_user_data
Large diffs are not rendered by default.
Oops, something went wrong.
210 changes: 209 additions & 1 deletion
210
...uster/additional_cidr/data/aws_launch_template_nodes.additionalcidr.example.com_user_data
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,209 @@ | ||
#!/bin/bash
# Copyright 2016 The Kubernetes Authors All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
#     http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

set -o errexit
set -o nounset
set -o pipefail

NODEUP_URL=https://artifacts.k8s.io/binaries/kops/1.15.0/linux/amd64/nodeup,https://github.com/kubernetes/kops/releases/download/v1.15.0/linux-amd64-nodeup,https://kubeupv2.s3.amazonaws.com/kops/1.15.0/linux/amd64/nodeup
NODEUP_HASH=9604ef18267ad7b5cf4cebbf7ab64423cf5bb0342d169c608ac6376e6af26d81

export AWS_REGION=us-test-1




function ensure-install-dir() {
  INSTALL_DIR="/opt/kops"
  # On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec
  if [[ -d /var/lib/toolbox ]]; then
    INSTALL_DIR="/var/lib/toolbox/kops"
  fi
  mkdir -p ${INSTALL_DIR}/bin
  mkdir -p ${INSTALL_DIR}/conf
  cd ${INSTALL_DIR}
}

# Retry a download until we get it. args: name, sha, url1, url2...
download-or-bust() {
  local -r file="$1"
  local -r hash="$2"
  shift 2

  urls=( $* )
  while true; do
    for url in "${urls[@]}"; do
      commands=(
        "curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10"
        "wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10"
        "curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10"
        "wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10"
      )
      for cmd in "${commands[@]}"; do
        echo "Attempting download with: ${cmd} {url}"
        if ! (${cmd} "${url}"); then
          echo "== Download failed with ${cmd} =="
          continue
        fi
        if [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then
          echo "== Hash validation of ${url} failed. Retrying. =="
          rm -f "${file}"
        else
          if [[ -n "${hash}" ]]; then
            echo "== Downloaded ${url} (SHA1 = ${hash}) =="
          else
            echo "== Downloaded ${url} =="
          fi
          return
        fi
      done
    done

    echo "All downloads failed; sleeping before retrying"
    sleep 60
  done
}

validate-hash() {
  local -r file="$1"
  local -r expected="$2"
  local actual

  actual=$(sha256sum ${file} | awk '{ print $1 }') || true
  if [[ "${actual}" != "${expected}" ]]; then
    echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} =="
    return 1
  fi
}

function split-commas() {
  echo $1 | tr "," "\n"
}

function try-download-release() {
  local -r nodeup_urls=( $(split-commas "${NODEUP_URL}") )
  if [[ -n "${NODEUP_HASH:-}" ]]; then
    local -r nodeup_hash="${NODEUP_HASH}"
  else
  # TODO: Remove?
    echo "Downloading sha256 (not found in env)"
    download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}"
    local -r nodeup_hash=$(cat nodeup.sha256)
  fi

  echo "Downloading nodeup (${nodeup_urls[@]})"
  download-or-bust nodeup "${nodeup_hash}" "${nodeup_urls[@]}"

  chmod +x nodeup
}

function download-release() {
  case "$(uname -m)" in
  x86_64*|i?86_64*|amd64*)
    NODEUP_URL="${NODEUP_URL}"
    NODEUP_HASH="${NODEUP_HASH}"
    ;;
  *)
    echo "Unsupported host arch: $(uname -m)" >&2
    exit 1
    ;;
  esac

  # In case of failure checking integrity of release, retry.
  cd ${INSTALL_DIR}/bin
  until try-download-release; do
    sleep 15
    echo "Couldn't download release. Retrying..."
  done

  echo "Running nodeup"
  # We can't run in the foreground because of https://github.com/docker/docker/issues/23793
  ( cd ${INSTALL_DIR}/bin; ./nodeup --install-systemd-unit --conf=${INSTALL_DIR}/conf/kube_env.yaml --v=8  )
}

####################################################################################

/bin/systemd-machine-id-setup || echo "failed to set up ensure machine-id configured"

echo "== nodeup node config starting =="
ensure-install-dir

cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC'
cloudConfig: null
containerRuntime: docker
containerd:
  skipInstall: true
docker:
  ipMasq: false
  ipTables: false
  logDriver: json-file
  logLevel: info
  logOpt:
  - max-size=10m
  - max-file=5
  storage: overlay2,overlay,aufs
  version: 18.06.3
kubeProxy:
  clusterCIDR: 100.96.0.0/11
  cpuRequest: 100m
  hostnameOverride: '@aws'
  image: k8s.gcr.io/kube-proxy:v1.14.0
  logLevel: 2
kubelet:
  anonymousAuth: false
  cgroupRoot: /
  cloudProvider: aws
  clusterDNS: 100.64.0.10
  clusterDomain: cluster.local
  enableDebuggingHandlers: true
  evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5%
  featureGates:
    ExperimentalCriticalPodAnnotation: "true"
  hostnameOverride: '@aws'
  kubeconfigPath: /var/lib/kubelet/kubeconfig
  logLevel: 2
  networkPluginMTU: 9001
  networkPluginName: kubenet
  nonMasqueradeCIDR: 100.64.0.0/10
  podInfraContainerImage: k8s.gcr.io/pause:3.2
  podManifestPath: /etc/kubernetes/manifests

__EOF_CLUSTER_SPEC

cat > conf/ig_spec.yaml << '__EOF_IG_SPEC'
kubelet: null
nodeLabels: null
taints: null

__EOF_IG_SPEC

cat > conf/kube_env.yaml << '__EOF_KUBE_ENV'
Assets:
- c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet
- 7e3a3ea663153f900cbd52900a39c91fa9f334be@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubectl
- 52e9d2de8a5f927307d9397308735658ee44ab8d@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz
ClusterName: additionalcidr.example.com
ConfigBase: memfs://clusters.example.com/additionalcidr.example.com
InstanceGroupName: nodes
Tags:
- _automatic_upgrades
- _aws
channels:
- memfs://clusters.example.com/additionalcidr.example.com/addons/bootstrap-channel.yaml

__EOF_KUBE_ENV

download-release
echo "== nodeup node config done =="
 | ||
#!/bin/bash | ||
# Copyright 2016 The Kubernetes Authors All rights reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
set -o errexit | ||
set -o nounset | ||
set -o pipefail | ||
|
||
NODEUP_URL=https://artifacts.k8s.io/binaries/kops/1.15.0/linux/amd64/nodeup,https://github.com/kubernetes/kops/releases/download/v1.15.0/linux-amd64-nodeup,https://kubeupv2.s3.amazonaws.com/kops/1.15.0/linux/amd64/nodeup | ||
NODEUP_HASH=9604ef18267ad7b5cf4cebbf7ab64423cf5bb0342d169c608ac6376e6af26d81 | ||
|
||
export AWS_REGION=us-test-1 | ||
|
||
|
||
|
||
|
||
function ensure-install-dir() { | ||
INSTALL_DIR="/opt/kops" | ||
# On ContainerOS, we install under /var/lib/toolbox; /opt is ro and noexec | ||
if [[ -d /var/lib/toolbox ]]; then | ||
INSTALL_DIR="/var/lib/toolbox/kops" | ||
fi | ||
mkdir -p ${INSTALL_DIR}/bin | ||
mkdir -p ${INSTALL_DIR}/conf | ||
cd ${INSTALL_DIR} | ||
} | ||
|
||
# Retry a download until we get it. args: name, sha, url1, url2... | ||
download-or-bust() { | ||
local -r file="$1" | ||
local -r hash="$2" | ||
shift 2 | ||
|
||
urls=( $* ) | ||
while true; do | ||
for url in "${urls[@]}"; do | ||
commands=( | ||
"curl -f --ipv4 --compressed -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" | ||
"wget --inet4-only --compression=auto -O "${file}" --connect-timeout=20 --tries=6 --wait=10" | ||
"curl -f --ipv4 -Lo "${file}" --connect-timeout 20 --retry 6 --retry-delay 10" | ||
"wget --inet4-only -O "${file}" --connect-timeout=20 --tries=6 --wait=10" | ||
) | ||
for cmd in "${commands[@]}"; do | ||
echo "Attempting download with: ${cmd} {url}" | ||
if ! (${cmd} "${url}"); then | ||
echo "== Download failed with ${cmd} ==" | ||
continue | ||
fi | ||
if [[ -n "${hash}" ]] && ! validate-hash "${file}" "${hash}"; then | ||
echo "== Hash validation of ${url} failed. Retrying. ==" | ||
rm -f "${file}" | ||
else | ||
if [[ -n "${hash}" ]]; then | ||
echo "== Downloaded ${url} (SHA1 = ${hash}) ==" | ||
else | ||
echo "== Downloaded ${url} ==" | ||
fi | ||
return | ||
fi | ||
done | ||
done | ||
|
||
echo "All downloads failed; sleeping before retrying" | ||
sleep 60 | ||
done | ||
} | ||
|
||
validate-hash() { | ||
local -r file="$1" | ||
local -r expected="$2" | ||
local actual | ||
|
||
actual=$(sha256sum ${file} | awk '{ print $1 }') || true | ||
if [[ "${actual}" != "${expected}" ]]; then | ||
echo "== ${file} corrupted, hash ${actual} doesn't match expected ${expected} ==" | ||
return 1 | ||
fi | ||
} | ||
|
||
function split-commas() { | ||
echo $1 | tr "," "\n" | ||
} | ||
|
||
function try-download-release() { | ||
local -r nodeup_urls=( $(split-commas "${NODEUP_URL}") ) | ||
if [[ -n "${NODEUP_HASH:-}" ]]; then | ||
local -r nodeup_hash="${NODEUP_HASH}" | ||
else | ||
# TODO: Remove? | ||
echo "Downloading sha256 (not found in env)" | ||
download-or-bust nodeup.sha256 "" "${nodeup_urls[@]/%/.sha256}" | ||
local -r nodeup_hash=$(cat nodeup.sha256) | ||
fi | ||
|
||
echo "Downloading nodeup (${nodeup_urls[@]})" | ||
download-or-bust nodeup "${nodeup_hash}" "${nodeup_urls[@]}" | ||
|
||
chmod +x nodeup | ||
} | ||
|
||
function download-release() { | ||
case "$(uname -m)" in | ||
x86_64*|i?86_64*|amd64*) | ||
NODEUP_URL="${NODEUP_URL}" | ||
NODEUP_HASH="${NODEUP_HASH}" | ||
;; | ||
*) | ||
echo "Unsupported host arch: $(uname -m)" >&2 | ||
exit 1 | ||
;; | ||
esac | ||
|
||
# In case of failure checking integrity of release, retry. | ||
cd ${INSTALL_DIR}/bin | ||
until try-download-release; do | ||
sleep 15 | ||
echo "Couldn't download release. Retrying..." | ||
done | ||
|
||
echo "Running nodeup" | ||
# We can't run in the foreground because of https://github.com/docker/docker/issues/23793 | ||
( cd ${INSTALL_DIR}/bin; ./nodeup --install-systemd-unit --conf=${INSTALL_DIR}/conf/kube_env.yaml --v=8 ) | ||
} | ||
|
||
#################################################################################### | ||
|
||
/bin/systemd-machine-id-setup || echo "failed to set up ensure machine-id configured" | ||
|
||
echo "== nodeup node config starting ==" | ||
ensure-install-dir | ||
|
||
cat > conf/cluster_spec.yaml << '__EOF_CLUSTER_SPEC' | ||
cloudConfig: null | ||
containerRuntime: docker | ||
containerd: | ||
skipInstall: true | ||
docker: | ||
ipMasq: false | ||
ipTables: false | ||
logDriver: json-file | ||
logLevel: info | ||
logOpt: | ||
- max-size=10m | ||
- max-file=5 | ||
storage: overlay2,overlay,aufs | ||
version: 18.06.3 | ||
kubeProxy: | ||
clusterCIDR: 100.96.0.0/11 | ||
cpuRequest: 100m | ||
hostnameOverride: '@aws' | ||
image: k8s.gcr.io/kube-proxy:v1.14.0 | ||
logLevel: 2 | ||
kubelet: | ||
anonymousAuth: false | ||
cgroupRoot: / | ||
cloudProvider: aws | ||
clusterDNS: 100.64.0.10 | ||
clusterDomain: cluster.local | ||
enableDebuggingHandlers: true | ||
evictionHard: memory.available<100Mi,nodefs.available<10%,nodefs.inodesFree<5%,imagefs.available<10%,imagefs.inodesFree<5% | ||
featureGates: | ||
ExperimentalCriticalPodAnnotation: "true" | ||
hostnameOverride: '@aws' | ||
kubeconfigPath: /var/lib/kubelet/kubeconfig | ||
logLevel: 2 | ||
networkPluginMTU: 9001 | ||
networkPluginName: kubenet | ||
nonMasqueradeCIDR: 100.64.0.0/10 | ||
podInfraContainerImage: k8s.gcr.io/pause:3.2 | ||
podManifestPath: /etc/kubernetes/manifests | ||
|
||
__EOF_CLUSTER_SPEC | ||
|
||
cat > conf/ig_spec.yaml << '__EOF_IG_SPEC' | ||
kubelet: null | ||
nodeLabels: null | ||
taints: null | ||
|
||
__EOF_IG_SPEC | ||
|
||
cat > conf/kube_env.yaml << '__EOF_KUBE_ENV' | ||
Assets: | ||
- c3b736fd0f003765c12d99f2c995a8369e6241f4@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubelet | ||
- 7e3a3ea663153f900cbd52900a39c91fa9f334be@https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/amd64/kubectl | ||
- 52e9d2de8a5f927307d9397308735658ee44ab8d@https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz | ||
ClusterName: additionalcidr.example.com | ||
ConfigBase: memfs://clusters.example.com/additionalcidr.example.com | ||
InstanceGroupName: nodes | ||
Tags: | ||
- _automatic_upgrades | ||
- _aws | ||
channels: | ||
- memfs://clusters.example.com/additionalcidr.example.com/addons/bootstrap-channel.yaml | ||
|
||
__EOF_KUBE_ENV | ||
|
||
download-release | ||
echo "== nodeup node config done ==" |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Any reason the tag also contains patch version?
For 0.11 I not much will change and for 0.12 I think we want to know if something breaks.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hashicorp doesn't have major.minor tags: https://hub.docker.com/r/hashicorp/terraform/tags
I suppose we could keep the
0.11.14
tag and uselatest
for 0.12+ ? I may address that in a followup PR though.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍