Several bugfixes to make simulator work with Kubernetes 1.22 #327
Conversation
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
added 9 commits
February 22, 2022 11:12
jpts
requested review from
s-irvine,
pi-unnerup,
jondkent,
abdullahgarcia,
denhamparry and
a team
as code owners
sublimino
reviewed
Feb 24, 2022
| @@ -44,7 +44,7 @@ RUN terraform-bundle package terraform-bundle.hcl && \ | |||
|
|
|||
| # Default configuration for dep | |||
| ARG JQ_VERSION=1.6 | |||
| ARG YQ_VERSION=2.7.2 | |||
| ARG YQ_VERSION=3.4.1 | |||
There was a problem hiding this comment.
IIRC this will be a breaking change for many scenarios
sublimino
reviewed
Feb 24, 2022
| @@ -4,7 +4,4 @@ AWS_SECRET_ACCESS_KEY | |||
|
|
|||
| # AWS Configuration | |||
| AWS_REGION | |||
| AWS_DEFAULT_REGION | |||
There was a problem hiding this comment.
Why do these go? The golang AWS library is difficult and non-obvious WRT to these, I can't recall the detail as to why they're all there but they were necessary once
sublimino
reviewed
Feb 24, 2022
| @@ -28,7 +28,6 @@ resource "aws_instance" "simulator_node_instances" { | |||
| associate_public_ip_address = false | |||
| subnet_id = var.private_subnet_id | |||
| user_data = element(data.template_file.node_cloud_config.*.rendered, count.index) | |||
| depends_on = [aws_instance.simulator_master_instances] | |||
There was a problem hiding this comment.
Can you elaborate on this change?
| - '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 init --pod-network-cidr=192.168.0.0/16' | ||
| - 'apt install -y containerd kubelet=${version}-00 kubeadm=${version}-00 kubectl=${version}-00 awscli' |
There was a problem hiding this comment.
Please use simulator-private as a base, this needs --allow-downgrades
| - "systemctl restart docker" | ||
| - "systemctl restart kubelet" | ||
| - "while true; do aws s3 ls s3://${s3_bucket_name}/join.txt > /dev/null; if [ $? -ne 0 ]; then sleep 10; else break; fi; done && aws s3 cp s3://${s3_bucket_name}/join.txt /tmp && sh /tmp/join.txt" | ||
| - "apt install -y containerd kubelet=${version}-00 kubeadm=${version}-00 kubectl=${version}-00 awscli" |
There was a problem hiding this comment.
As above, downgrade required IIRC
| @@ -1,6 +1,10 @@ | |||
| resource "null_resource" "master_test" { | |||
| count = var.number_of_master_instances | |||
|
|
|||
| triggers = { | |||
| cluster_instance_ids = "${join(",", aws_instance.simulator_master_instances.*.id)}" | |||
There was a problem hiding this comment.
Does this prevent rebuilds of existing infra?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
fix: Switch to containerd and pin k8s version (defaults to 1.22.7)
fix: switch to nerdctl to query pod status on node
fix: remove unused/deprecated env vars
fix: Pin yq, to allow use of v3 syntax
fix: ensure internet connectivity in private net
fix: ensure tests are run during node re-deploy
feat: Catch failed cloud-init run before goss
feat: Bump AMI to Ubuntu 20.04
feat: Remove master->node provisioning dependency (to speed up deployment speed)
What is the current behavior? (You can also link to an open issue here)
simulator clusters do not currently spin up correctly
What is the new behavior (if this is a feature change)?
Major new features: