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.

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

Use proper versions for vSphere CCM/CPI and update machine-controller to v1.35.2 #1489

Merged
merged 2 commits into from
Sep 3, 2021
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
2 changes: 1 addition & 1 deletion pkg/addons/applier.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func newAddonsApplier(s *state.State) (*applier, error) {
return nil, errors.Wrap(err, "failed to load CA keypair")
}

// We want to be true in two cases:
// We want this to be true in two cases:
// * if the CSI migration is already enabled
// * if we are starting the CCM/CSI migration process
csiMigration := s.CCMMigration
Expand Down
8 changes: 6 additions & 2 deletions pkg/templates/images/images.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func baseResources() map[Resource]map[string]string {
CalicoNode: {"*": "docker.io/calico/node:v3.19.1"},
DNSNodeCache: {"*": "k8s.gcr.io/k8s-dns-node-cache:1.15.13"},
Flannel: {"*": "quay.io/coreos/flannel:v0.13.0"},
MachineController: {"*": "docker.io/kubermatic/machine-controller:v1.35.1"},
MachineController: {"*": "docker.io/kubermatic/machine-controller:v1.35.2"},
MetricsServer: {"*": "k8s.gcr.io/metrics-server/metrics-server:v0.5.0"},
}
}
Expand Down Expand Up @@ -134,7 +134,11 @@ func optionalResources() map[Resource]map[string]string {
PacketCCM: {"*": "docker.io/packethost/packet-ccm:v1.0.0"},

// vSphere CCM
VsphereCCM: {"*": "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.2.1"},
VsphereCCM: {
"1.19.x": "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.19.0",
"1.20.x": "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.20.0",
">= 1.21.0": "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.21.0",
},

// vSphere CSI
VsphereCSIDriver: {"*": "gcr.io/cloud-provider-vsphere/csi/release/driver:v2.3.0"},
Expand Down