Sitelet https://github.com/kubernetes/kops/pull/18649/files
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 1 addition & 11 deletions pkg/model/components/awscloudcontrollermanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,7 @@ func (b *AWSCloudControllerManagerOptionsBuilder) BuildOptions(cluster *kops.Clu
}

if eccm.Image == "" {
// See https://us.gcr.io/k8s-artifacts-prod/provider-aws/cloud-controller-manager
switch b.ControlPlaneKubernetesVersion().Minor() {
case 32:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5"
case 33:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.33.2"
case 34:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0"
default:
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0"
}
eccm.Image = "registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1"
}

return nil
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 15006609a7898026f87810402911936af6d2edc8d95903449b4d3e2078b7b5d6
manifestHash: 94d747a6e4220bab6c959109246f8f6f942750486c9c2cc613758afc27b508b1
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: additionalobjects.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.34.0
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: c36e4ce956c7a47be9fee95dc29d26c520fbde69fa2ed0deba48286297448f35
manifestHash: f940e1bbbf6bc728c61c2ccce461f45c3063f586c0b22695d840640ae250ae80
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ spec:
value: arn:aws-test:iam::123456789012:role/aws-cloud-controller-manager.kube-system.sa.minimal.example.com
- name: AWS_WEB_IDENTITY_TOKEN_FILE
value: /var/run/secrets/amazonaws.com/token
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 69492a91fde143770836032baba838f346787af29d7299053a336720752ab287
manifestHash: 384e6427b17d9d92cee587c4197a44631f2ac33e8aacb97a714598763c64111c
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: f2f9d21f55213f224a4a2c029e1499f7251bc9213ff584ba7088abaed1a0c5dc
manifestHash: acda28128ee7d6c09f88106c27f419d82f55ade734c5cfa841a54ef0da49f4c3
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: bastionuserdata.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: f69f480893c1ef8f36b6b12c7542d87ddfe86716232ef119825f7da3edff9ed9
manifestHash: 453ab2860e3532ebedd662440fca71ae358b0fb73ebcbb2b92a177871edb7f3d
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: cas-priority-expander-custom.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 267d3c45193c89bc133f1db4b377a4dfe376db8528703a69a5cd3682bd340c24
manifestHash: 0d28839658df2a50d8c42e1eb78bc5e0109c65aecf4ffdb31c6e55ce38c5de2f
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: cas-priority-expander.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ spec:
clusterName: complex.example.com
concurrentNodeSyncs: 5
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ spec:
role.kubernetes.io/authentication: "1"
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: cda68a9b9ded1cd88ee0bf40ffb03d2deea5ebfcb0cf09bc44ffa883b9f08758
manifestHash: 7be17631027d3a2d44f30333221b45df768263d1f40a0f4333259430473d06bd
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: compress.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 697de55684f78367375b72a8fd8308953f4e36604637549bfb407fb65bf2ac39
manifestHash: 0f60db003819060795bc0d857cbfe9991c6b1721cd0e4eeb1127dee53ea6c7ad
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: containerd.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: c1d6a6fba240e1c2f9c187015965306df287a19b21b081697ddc098fea295b65
manifestHash: b1b31aa5ae37d70a8b118bd5f3082f985495341fcb1e9d0e14166b1b2133e694
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/update_cluster/containerd/assets.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,8 @@ images:
download: registry.k8s.io/pause:3.10.1
- canonical: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.58.0
download: registry.k8s.io/provider-aws/aws-ebs-csi-driver:v1.58.0
- canonical: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
download: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
- canonical: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
download: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
- canonical: registry.k8s.io/sig-storage/csi-attacher:v4.11.0
download: registry.k8s.io/sig-storage/csi-attacher:v4.11.0
- canonical: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.16.0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: containerd.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: c1d6a6fba240e1c2f9c187015965306df287a19b21b081697ddc098fea295b65
manifestHash: b1b31aa5ae37d70a8b118bd5f3082f985495341fcb1e9d0e14166b1b2133e694
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: f83d7390bc994a88a3096b2099c58b539c8414e6470cf61257a0905eec36b2a8
manifestHash: 156f36763d1c5a84907c711ded2bf28f23715b7dff94a530a1364e6ad034faf4
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: 123.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: existing-iam.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: f719a133948aeb85a0e734d2f1ca8ef44546a1bbd6f62046bc07a24f6eac03a6
manifestHash: 5f09df5d6583c24751d261618f85607793f604e0e7d3ab405dc92f60333b69b4
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: existingsg.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.18
manifest: aws-cloud-controller.addons.k8s.io/k8s-1.18.yaml
manifestHash: 5907c9458ec1c68b59a408d28f3f1b6e53efa7f99960e75d3c32d0fa8d0a1b6a
manifestHash: 8f3b821ffb9fc10c94905ec8bd4b37ac2b24567372874be3ff017e14828c142a
name: aws-cloud-controller.addons.k8s.io
selector:
k8s-addon: aws-cloud-controller.addons.k8s.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
clusterCIDR: 100.96.0.0/11
clusterName: minimal.example.com
configureCloudRoutes: false
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
leaderElection:
leaderElect: true
cloudProvider: aws
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ spec:
env:
- name: KUBERNETES_SERVICE_HOST
value: 127.0.0.1
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.32.5
image: registry.k8s.io/provider-aws/cloud-controller-manager:v1.36.1
imagePullPolicy: IfNotPresent
name: aws-cloud-controller-manager
resources:
Expand Down
Loading
Loading