Skip to content

Commit

Permalink
Fix GCE channels version constraints
Browse files Browse the repository at this point in the history
Previously k8s 1.17+ would always match with COS rather than Ubuntu 20.04 because of the unbound version range.

This should fix the failure to download logs via SSH here: https://prow.k8s.io/view/gs/kubernetes-jenkins/logs/e2e-kops-gce-kubetest2/1373013584195358720
The instance groups confirm the use of COS rather than u2004: https://storage.googleapis.com/kubernetes-jenkins/logs/e2e-kops-gce-kubetest2/1373013584195358720/artifacts/instancegroups.yaml
  • Loading branch information
rifelpet committed Mar 20, 2021
1 parent 7a7bd3f commit 6c76859
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion channels/alpha
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
- name: "cos-cloud/cos-stable-77-12371-114-0"
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.16.0-alpha.1"
kubernetesVersion: ">=1.16.0 <1.17.0"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210119a"
providerID: gce
architectureID: amd64
Expand Down
2 changes: 1 addition & 1 deletion channels/stable
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
- name: "cos-cloud/cos-stable-77-12371-114-0"
providerID: gce
architectureID: amd64
kubernetesVersion: ">=1.16.0-alpha.1"
kubernetesVersion: ">=1.16.0 <1.17.0"
- name: "ubuntu-os-cloud/ubuntu-2004-focal-v20210119a"
providerID: gce
architectureID: amd64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com
name: master-us-test1-a
spec:
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -85,7 +85,7 @@ metadata:
kops.k8s.io/cluster: gce.example.com
name: nodes-us-test1-a
spec:
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand Down
12 changes: 6 additions & 6 deletions tests/integration/create_cluster/ha_gce/expected-v1alpha2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-a
spec:
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -93,7 +93,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-b
spec:
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -116,7 +116,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: master-us-test1-c
spec:
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -139,7 +139,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-a
spec:
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand All @@ -162,7 +162,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-b
spec:
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand All @@ -185,7 +185,7 @@ metadata:
kops.k8s.io/cluster: ha-gce.example.com
name: nodes-us-test1-c
spec:
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ metadata:
kops.k8s.io/cluster: private.example.com
name: bastions
spec:
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: f1-micro
maxSize: 1
minSize: 1
Expand All @@ -98,7 +98,7 @@ spec:
additionalSecurityGroups:
- sg-exampleid3
- sg-exampleid4
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-1
maxSize: 1
minSize: 1
Expand All @@ -124,7 +124,7 @@ spec:
additionalSecurityGroups:
- sg-exampleid
- sg-exampleid2
image: cos-cloud/cos-stable-77-12371-114-0
image: ubuntu-os-cloud/ubuntu-2004-focal-v20210119a
machineType: n1-standard-2
maxSize: 1
minSize: 1
Expand Down

0 comments on commit 6c76859

Please sign in to comment.