Skip to content
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

20220210. bugbash fixes #35

Merged
merged 2 commits into from
Feb 14, 2022
Merged

20220210. bugbash fixes #35

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
c99d11a
bugfix. update workflow interface
Feb 10, 2022
9d5cf01
trivial. support kube v1.22.X
Feb 10, 2022
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
4 changes: 2 additions & 2 deletions sealed_secrets/setup-sealed-secrets-on-usercluster.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ spec:
- name: namespace
value: kube-system
- name: kubeconfig_secret_name
value: "{{workflow.parameters.cluster_id}}-kubeconfig"
value: "{{workflow.parameters.site_name}}-kubeconfig"

- - name: installControllers
templateRef:
Expand Down Expand Up @@ -67,4 +67,4 @@ spec:
- name: namespace
value: default
- name: kubeconfig_secret_name
value: "{{workflow.parameters.cluster_id}}-kubeconfig"
value: "{{workflow.parameters.site_name}}-kubeconfig"
2 changes: 1 addition & 1 deletion tks-cluster/artifacts/getPublicSubnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ def get_subnets(stream):
subnets=[]
try:
parsed = yaml.safe_load(stream)
for entry in parsed['spec']['networkSpec']['subnets']:
for entry in parsed['spec']['network']['subnets']:
if entry['isPublic']:
subnets.append(entry['id'])
except yaml.YAMLError as exc:
Expand Down
4 changes: 2 additions & 2 deletions tks-cluster/create-aws-infrastructure-w-terraform-wftpl.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,11 @@ spec:
- |
mkdir ~/.kube
cp /kube/value ~/.kube/config
while [ $(kubectl get awscluster -n argo $cluster_id -o jsonpath="{.spec.networkSpec.vpc.id}" | wc -c ) == 0 ]; do
while [ $(kubectl get awscluster -n argo $cluster_id -o jsonpath="{.spec.network.vpc.id}" | wc -c ) == 0 ]; do
echo "> Wait for checking the VPC ID"
sleep 30
done
vpc_id=$(kubectl get awscluster -n argo $cluster_id -o jsonpath="{.spec.networkSpec.vpc.id}")
vpc_id=$(kubectl get awscluster -n argo $cluster_id -o jsonpath="{.spec.network.vpc.id}")

cat <<EOF >/$cluster_id.yaml
apiVersion: app.terraform.io/v1alpha1
Expand Down