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.10] csi: use images from new location #3202

Merged
merged 2 commits into from
Sep 23, 2024
Merged

🌱 [release-1.10] csi: use images from new location #3202

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
736512b
csi: use images from new location
chrischdi Sep 23, 2024
da8e0e4
Fix CPI image location
chrischdi Sep 23, 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"
)

// CloudControllerManagerManifests returns the yaml manifests generated via
Expand Down
2 changes: 1 addition & 1 deletion packaging/flavorgen/cloudprovider/cpi/cpi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ spec:
priorityClassName: system-node-critical
containers:
- name: vsphere-cpi
image: gcr.io/cloud-provider-vsphere/cpi/release/manager:v1.30.0-rc.0
image: registry.k8s.io/cloud-pv-vsphere/cloud-provider-vsphere:v1.30.0
imagePullPolicy: IfNotPresent
args:
- --cloud-provider=vsphere
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 @@ -680,7 +680,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 @@ -740,7 +740,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 @@ -876,7 +876,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 @@ -1025,7 +1025,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 @@ -1289,7 +1289,7 @@ data:
priorityClassName: system-node-critical
containers:
- name: vsphere-cpi
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}
imagePullPolicy: IfNotPresent
args:
- --cloud-provider=vsphere
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 @@ -894,7 +894,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 @@ -954,7 +954,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 @@ -1090,7 +1090,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 @@ -1239,7 +1239,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 @@ -1503,7 +1503,7 @@ data:
priorityClassName: system-node-critical
containers:
- name: vsphere-cpi
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}
imagePullPolicy: IfNotPresent
args:
- --cloud-provider=vsphere
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 @@ -815,7 +815,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 @@ -875,7 +875,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 @@ -1011,7 +1011,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 @@ -1160,7 +1160,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 @@ -1424,7 +1424,7 @@ data:
priorityClassName: system-node-critical
containers:
- name: vsphere-cpi
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}
imagePullPolicy: IfNotPresent
args:
- --cloud-provider=vsphere
Expand Down
10 changes: 5 additions & 5 deletions templates/cluster-template-supervisor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,7 +774,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 @@ -834,7 +834,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 @@ -970,7 +970,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 @@ -1119,7 +1119,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 @@ -1383,7 +1383,7 @@ data:
priorityClassName: system-node-critical
containers:
- name: vsphere-cpi
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}
imagePullPolicy: IfNotPresent
args:
- --cloud-provider=vsphere
Expand Down
10 changes: 5 additions & 5 deletions templates/cluster-template-topology-supervisor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,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 @@ -642,7 +642,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 @@ -778,7 +778,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 @@ -927,7 +927,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 @@ -1191,7 +1191,7 @@ data:
priorityClassName: system-node-critical
containers:
- name: vsphere-cpi
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}
imagePullPolicy: IfNotPresent
args:
- --cloud-provider=vsphere
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 @@ -588,7 +588,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 @@ -648,7 +648,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 @@ -784,7 +784,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 @@ -933,7 +933,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 @@ -1197,7 +1197,7 @@ data:
priorityClassName: system-node-critical
containers:
- name: vsphere-cpi
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}
imagePullPolicy: IfNotPresent
args:
- --cloud-provider=vsphere
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 @@ -805,7 +805,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 @@ -865,7 +865,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 @@ -1001,7 +1001,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 @@ -1150,7 +1150,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 @@ -1414,7 +1414,7 @@ data:
priorityClassName: system-node-critical
containers:
- name: vsphere-cpi
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}
imagePullPolicy: IfNotPresent
args:
- --cloud-provider=vsphere
Expand Down
Loading
Loading