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

Jump to bottom

🌱 [release-1.9] csi: use images from new location #3203

Merged
merged 5 commits into from
Sep 24, 2024
Merged

🌱 [release-1.9] csi: use images from new location #3203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
30d1b5e
csi: use images from new location
chrischdi Sep 23, 2024
389bed7
Fix CPI image location
chrischdi Sep 23, 2024
13095f3
Drop csi for v1.7 and fix CPI image
chrischdi Sep 23, 2024
d057263
fixup
chrischdi Sep 23, 2024
6296740
fix v1.8 upgrade tests
chrischdi Sep 24, 2024
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 packaging/flavorgen/cloudprovider/cloud-controller-manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
// NOTE: the contents of this file are derived from https://github.com/kubernetes/cloud-provider-vsphere/tree/master/manifests/controller-manager

const (
CPIControllerImageURL = "gcr.io/cloud-provider-vsphere/cpi/release/manager"
CPIControllerImageURL = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere"
)

// CloudControllerManagerServiceAccount returns the ServiceAccount used for the cloud-controller-manager.
Expand Down
8 changes: 4 additions & 4 deletions packaging/flavorgen/cloudprovider/csi/kustomization.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ resources:
- vsphere-csi-driver.yaml
images:
- name: gcr.io/cloud-provider-vsphere/csi/ci/driver
newName: gcr.io/cloud-provider-vsphere/csi/release/driver
newTag: v3.1.0
newName: registry.k8s.io/csi-vsphere/driver
newTag: v3.1.2
- name: gcr.io/cloud-provider-vsphere/csi/ci/syncer
newName: gcr.io/cloud-provider-vsphere/csi/release/syncer
newTag: v3.1.0
newName: registry.k8s.io/csi-vsphere/syncer
newTag: v3.1.2
patches:
- patch: |-
kind: Deployment
Expand Down
2 changes: 1 addition & 1 deletion packaging/flavorgen/flavors/env/envsubts_consts.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const (
ClusterNameVar = "${CLUSTER_NAME}"
ClusterClassNameVar = "${CLUSTER_CLASS_NAME}"
ControlPlaneMachineCountVar = "${CONTROL_PLANE_MACHINE_COUNT}"
DefaultCloudProviderImage = "gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.2.1"
DefaultCloudProviderImage = "registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.2.1"
DefaultClusterCIDR = "192.168.0.0/16"
DefaultDiskGiB = 25
DefaultMemoryMiB = 8192
Expand Down
10 changes: 5 additions & 5 deletions templates/cluster-template-external-loadbalancer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -737,7 +737,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
imagePullPolicy: Always
name: vsphere-syncer
ports:
Expand Down Expand Up @@ -873,7 +873,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -1022,7 +1022,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -1328,7 +1328,7 @@ data:
- --v=2
- --cloud-provider=vsphere
- --cloud-config=/etc/cloud/vsphere.conf
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
name: vsphere-cloud-controller-manager
resources:
requests:
Expand Down
10 changes: 5 additions & 5 deletions templates/cluster-template-ignition.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,7 +881,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -941,7 +941,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
imagePullPolicy: Always
name: vsphere-syncer
ports:
Expand Down Expand Up @@ -1077,7 +1077,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -1226,7 +1226,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -1532,7 +1532,7 @@ data:
- --v=2
- --cloud-provider=vsphere
- --cloud-config=/etc/cloud/vsphere.conf
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
name: vsphere-cloud-controller-manager
resources:
requests:
Expand Down
10 changes: 5 additions & 5 deletions templates/cluster-template-node-ipam.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -862,7 +862,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
imagePullPolicy: Always
name: vsphere-syncer
ports:
Expand Down Expand Up @@ -998,7 +998,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -1147,7 +1147,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -1453,7 +1453,7 @@ data:
- --v=2
- --cloud-provider=vsphere
- --cloud-config=/etc/cloud/vsphere.conf
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
name: vsphere-cloud-controller-manager
resources:
requests:
Expand Down
10 changes: 5 additions & 5 deletions templates/cluster-template-topology.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -636,7 +636,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
imagePullPolicy: Always
name: vsphere-syncer
ports:
Expand Down Expand Up @@ -772,7 +772,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -921,7 +921,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -1227,7 +1227,7 @@ data:
- --v=2
- --cloud-provider=vsphere
- --cloud-config=/etc/cloud/vsphere.conf
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
name: vsphere-cloud-controller-manager
resources:
requests:
Expand Down
10 changes: 5 additions & 5 deletions templates/cluster-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,7 +792,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -852,7 +852,7 @@ data:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: gcr.io/cloud-provider-vsphere/csi/release/syncer:v3.1.0
image: registry.k8s.io/csi-vsphere/syncer:v3.1.2
imagePullPolicy: Always
name: vsphere-syncer
ports:
Expand Down Expand Up @@ -988,7 +988,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -1137,7 +1137,7 @@ data:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: "1"
image: gcr.io/cloud-provider-vsphere/csi/release/driver:v3.1.0
image: registry.k8s.io/csi-vsphere/driver:v3.1.2
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -1443,7 +1443,7 @@ data:
- --v=2
- --cloud-provider=vsphere
- --cloud-config=/etc/cloud/vsphere.conf
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:${CPI_IMAGE_K8S_VERSION}
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:${CPI_IMAGE_K8S_VERSION}
name: vsphere-cloud-controller-manager
resources:
requests:
Expand Down
Loading
Loading