Skip to content

Commit 4f06d4a

Browse files
admunadmun
authored
Merge branch 'kubernetes:master' into cilium-config-path
2 parents 2e380df + 298e771 commit 4f06d4a

File tree

2,921 files changed

+306827
-167801
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,921 files changed

+306827
-167801
lines changed

‎.github/workflows/e2e.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
path: ${{ env.GOPATH }}/src/k8s.io/kops
2323

2424
- name: Set up go
25-
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
25+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b
2626
with:
2727
go-version-file: '${{ env.GOPATH }}/src/k8s.io/kops/go.mod'
2828

‎.github/workflows/main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
path: ${{ env.GOPATH }}/src/k8s.io/kops
3232

3333
- name: Set up go
34-
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
34+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b
3535
with:
3636
go-version-file: "${{ env.GOPATH }}/src/k8s.io/kops/go.mod"
3737

@@ -48,7 +48,7 @@ jobs:
4848
path: ${{ env.GOPATH }}/src/k8s.io/kops
4949

5050
- name: Set up go
51-
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
51+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b
5252
with:
5353
go-version-file: "${{ env.GOPATH }}/src/k8s.io/kops/go.mod"
5454

@@ -65,7 +65,7 @@ jobs:
6565
path: ${{ env.GOPATH }}/src/k8s.io/kops
6666

6767
- name: Set up go
68-
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
68+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b
6969
with:
7070
go-version-file: "${{ env.GOPATH }}/src/k8s.io/kops/go.mod"
7171

@@ -92,7 +92,7 @@ jobs:
9292
path: ${{ env.GOPATH }}/src/k8s.io/kops
9393

9494
- name: Set up go
95-
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34
95+
uses: actions/setup-go@0aaccfd150d50ccaeb58ebd88d36e91967a5f35b
9696
with:
9797
go-version-file: "${{ env.GOPATH }}/src/k8s.io/kops/go.mod"
9898

‎channels/stable

+14-14
Original file line numberDiff line numberDiff line change
@@ -58,27 +58,27 @@ spec:
5858
providerID: aws
5959
architectureID: amd64
6060
kubernetesVersion: ">=1.17.0 <1.18.0"
61-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250210
61+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20250312
6262
providerID: aws
6363
architectureID: amd64
6464
kubernetesVersion: ">=1.18.0 <1.27.0"
65-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20250210
65+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20250312
6666
providerID: aws
6767
architectureID: arm64
6868
kubernetesVersion: ">=1.20.0 <1.27.0"
69-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250211
69+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-20250305
7070
providerID: aws
7171
architectureID: amd64
7272
kubernetesVersion: ">=1.27.0 <1.32.0"
73-
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20250211
73+
- name: 099720109477/ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-20250305
7474
providerID: aws
7575
architectureID: arm64
7676
kubernetesVersion: ">=1.27.0 <1.32.0"
77-
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250115
77+
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-amd64-server-20250305
7878
providerID: aws
7979
architectureID: amd64
8080
kubernetesVersion: ">=1.32.0"
81-
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250115
81+
- name: 099720109477/ubuntu/images/hvm-ssd-gp3/ubuntu-noble-24.04-arm64-server-20250305
8282
providerID: aws
8383
architectureID: arm64
8484
kubernetesVersion: ">=1.32.0"
@@ -120,16 +120,16 @@ spec:
120120
kubenet: {}
121121
kubernetesVersions:
122122
- range: ">=1.32.0"
123-
recommendedVersion: 1.32.2
123+
recommendedVersion: 1.32.3
124124
requiredVersion: 1.30.0
125125
- range: ">=1.31.0"
126-
recommendedVersion: 1.31.6
126+
recommendedVersion: 1.31.7
127127
requiredVersion: 1.30.0
128128
- range: ">=1.30.0"
129-
recommendedVersion: 1.30.10
129+
recommendedVersion: 1.30.11
130130
requiredVersion: 1.30.0
131131
- range: ">=1.29.0"
132-
recommendedVersion: 1.29.14
132+
recommendedVersion: 1.29.15
133133
requiredVersion: 1.29.0
134134
- range: ">=1.28.0"
135135
recommendedVersion: 1.28.15
@@ -192,19 +192,19 @@ spec:
192192
- range: ">=1.32.0-alpha.1"
193193
recommendedVersion: "1.31.0-beta.1"
194194
#requiredVersion: 1.32.0
195-
kubernetesVersion: 1.32.2
195+
kubernetesVersion: 1.32.3
196196
- range: ">=1.31.0-alpha.1"
197197
recommendedVersion: "1.31.0-beta.1"
198198
#requiredVersion: 1.31.0
199-
kubernetesVersion: 1.31.6
199+
kubernetesVersion: 1.31.7
200200
- range: ">=1.30.0-alpha.1"
201201
recommendedVersion: "1.30.3"
202202
#requiredVersion: 1.30.0
203-
kubernetesVersion: 1.30.10
203+
kubernetesVersion: 1.30.11
204204
- range: ">=1.29.0-alpha.1"
205205
recommendedVersion: "1.30.3"
206206
#requiredVersion: 1.29.0
207-
kubernetesVersion: 1.29.14
207+
kubernetesVersion: 1.29.15
208208
- range: ">=1.28.0-alpha.1"
209209
recommendedVersion: "1.30.3"
210210
#requiredVersion: 1.28.0

‎cmd/kops/integration_test.go

+11-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222
"crypto/rand"
2323
"crypto/rsa"
2424
"crypto/x509"
25+
"encoding/json"
2526
"encoding/pem"
2627
"fmt"
2728
"os"
@@ -1203,10 +1204,19 @@ func (i *integrationTest) runTest(t *testing.T, ctx context.Context, h *testutil
12031204
options.ClusterName = i.clusterName
12041205
options.LifecycleOverrides = i.lifecycleOverrides
12051206

1206-
_, err := RunUpdateCluster(ctx, factory, &stdout, options)
1207+
updateClusterResults, err := RunUpdateCluster(ctx, factory, &stdout, options)
12071208
if err != nil {
12081209
t.Fatalf("error running update cluster %q: %v", i.clusterName, err)
12091210
}
1211+
1212+
// Verify that we can print all the tasks
1213+
// Catches bugs like https://github.com/kubernetes/kops/issues/17316
1214+
for key, task := range updateClusterResults.TaskMap {
1215+
if _, err := json.Marshal(task); err != nil {
1216+
t.Errorf("unable to marshal task %q of type %T to json: %v", key, task, err)
1217+
}
1218+
}
1219+
12101220
}
12111221

12121222
// Compare main files

0 commit comments

Comments
 (0)