Skip to content

fix: Fix terraform cluster init and yq@4 usage #315

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: Fix terraform cluster init and yq@4 usage #315

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a57dc0e
fix: use official docker ubuntu package
paschdan May 6, 2021
3fb970c
fix: update yq usage for yq@4
paschdan May 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion simulation-scripts/perturb.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ template_tasks() {
local pod_name
local POD_NAME
local POD_RESULT
tasks_json=$(yq r -j tasks.yaml)
tasks_json=$(yq eval -j tasks.yaml)
cp tasks.yaml "${tmptasks}"
POD_NAME=$(echo "${tasks_json}" | jq -r '.tasks[].startingPoint.podName | select (.!=null)')
for pod_name in $POD_NAME; do
Expand Down
5 changes: 4 additions & 1 deletion terraform/modules/AWS/Kubernetes/master-cloud-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ write_files:
runcmd:
- 'curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -'
- 'echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list'
- 'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -'
- 'add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"'
- 'mkdir /run/download'
- 'apt update'
- 'apt install -y kubelet kubeadm kubectl docker.io awscli'
- 'apt install -y kubelet kubeadm kubectl docker-ce awscli'
- 'wget https://github.com/kubernetes-incubator/cri-tools/releases/download/v1.11.1/crictl-v1.11.1-linux-amd64.tar.gz -O /run/download/crictl.tgz'
- 'tar -C /usr/bin -xzf /run/download/crictl.tgz'
- 'chmod 754 /usr/bin/crictl'
Expand All @@ -61,6 +63,7 @@ runcmd:
- 'systemctl restart kubelet'
- 'wget https://docs.projectcalico.org/v3.3/getting-started/kubernetes/installation/hosted/rbac-kdd.yaml -O /run/download/rbac-kdd.yaml'
- 'wget https://docs.projectcalico.org/v3.9/manifests/calico.yaml -O /run/download/calico.yaml'
- 'kubeadm config images pull'
- 'kubeadm init --pod-network-cidr=192.168.0.0/16'
- 'mkdir /root/.kube'
- 'cp /etc/kubernetes/admin.conf /root/.kube/config'
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/AWS/Kubernetes/master-goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ service:
group:
docker:
exists: true
gid: 115
gid: 999
process:
kubelet:
running: true
Expand Down
4 changes: 3 additions & 1 deletion terraform/modules/AWS/Kubernetes/node-cloud-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,11 @@ write_files:
runcmd:
- "curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add -"
- 'echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" > /etc/apt/sources.list.d/kubernetes.list'
- 'curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -'
- 'add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable"'
- "mkdir /run/download"
- "apt update"
- "apt install -y kubelet kubeadm kubectl docker.io awscli"
- 'apt install -y kubelet kubeadm kubectl docker-ce awscli'
- "wget https://github.com/kubernetes-incubator/cri-tools/releases/download/v1.11.1/crictl-v1.11.1-linux-amd64.tar.gz -O /run/download/crictl.tgz"
- "tar -C /usr/bin -xzf /run/download/crictl.tgz"
- "rm -rf /run/download"
Expand Down
2 changes: 1 addition & 1 deletion terraform/modules/AWS/Kubernetes/node-goss.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ service:
group:
docker:
exists: true
gid: 115
gid: 999
process:
kubelet:
running: true
Expand Down