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
5 changes: 3 additions & 2 deletions class/defaults.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ parameters:
feature_states:
trigger-csi-fullsync: "false"
pv-to-backingdiskobjectid-mapping: "false"
high-pv-node-density: "false"

images:
csi_attacher:
Expand All @@ -37,11 +38,11 @@ parameters:
driver:
registry: registry.k8s.io
repository: csi-vsphere/driver
tag: v3.7.0
tag: v3.7.1
syncer:
registry: registry.k8s.io
repository: csi-vsphere/syncer
tag: v3.7.0
tag: v3.7.1
liveness_probe:
registry: registry.k8s.io
repository: sig-storage/livenessprobe
Expand Down
10 changes: 5 additions & 5 deletions docs/modules/ROOT/pages/references/parameters.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ If set, renders `volumeBindingMode`.

[horizontal]
type:: dictionary
default:: https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.7.0/manifests/vanilla/vsphere-csi-driver.yaml[Upstream v3.6.1 defaults], excluding the Windows daemon set
default:: https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.7.1/manifests/vanilla/vsphere-csi-driver.yaml[Upstream v3.7.1 defaults], excluding the Windows daemon set

The feature state switches rendered into the driver `ConfigMap`.

Expand All @@ -249,7 +249,7 @@ The feature state switches rendered into the driver `ConfigMap`.
type:: dictionary

Container images for the controller sidecars, node sidecars, CSI driver, and syncer.
Defaults follow the upstream v3.7.0 Linux deployment manifest.
Defaults follow the upstream v3.7.1 Linux deployment manifest.

== `controller`

Expand Down Expand Up @@ -328,7 +328,7 @@ Optional extra node selector for the controller deployment.

[horizontal]
type:: dictionary
default:: https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v3.7.0/manifests/vanilla/vsphere-csi-driver.yaml[Upstream v3.6.1 control-plane node affinity]
default:: https://raw.githubusercontent.com/kubernetes-sigs/vsphere-csi-driver/v3.7.1/manifests/vanilla/vsphere-csi-driver.yaml[Upstream v3.7.1 control-plane node affinity]

Node affinity for the controller deployment.
By default this matches upstream and allows any of the common control-plane labels.
Expand All @@ -337,7 +337,7 @@ By default this matches upstream and allows any of the common control-plane labe

[horizontal]
type:: list
default:: https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.7.0/manifests/vanilla/vsphere-csi-driver.yaml[Upstream control-plane tolerations]
default:: https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.7.1/manifests/vanilla/vsphere-csi-driver.yaml[Upstream control-plane tolerations]

Tolerations for the controller deployment.

Expand Down Expand Up @@ -418,7 +418,7 @@ Node selector for the Linux node DaemonSet.

[horizontal]
type:: list
default:: https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.7.0/manifests/vanilla/vsphere-csi-driver.yaml[Upstream node tolerations]
default:: https://github.com/kubernetes-sigs/vsphere-csi-driver/blob/v3.7.1/manifests/vanilla/vsphere-csi-driver.yaml[Upstream node tolerations]

Tolerations for the Linux node DaemonSet.

Expand Down
47 changes: 39 additions & 8 deletions scripts/sync-vsphere-csi-release.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,42 @@ function extractManifestImage(manifestText, containerName) {
}

function extractFeatureStates(manifestText) {
const match = manifestText.match(
/apiVersion:\s+v1\ndata:\n((?: ".*": ".*"\n)+)kind:\s+ConfigMap\nmetadata:\n name:\s+internal-feature-states\.csi\.vsphere\.vmware\.com\n namespace:\s+vmware-system-csi/m
);
const configMapDoc = manifestText
.split(/^---\s*$/m)
.find(
(doc) =>
doc.includes('kind: ConfigMap') &&
doc.includes('name: internal-feature-states.csi.vsphere.vmware.com') &&
doc.includes('namespace: vmware-system-csi')
);

if (!match) {
if (!configMapDoc) {
throw new Error('Unable to find internal feature states ConfigMap in upstream manifest');
}

return match[1]
.trimEnd()
.split('\n')
const lines = configMapDoc.split('\n');
const dataIndex = lines.findIndex((line) => line === 'data:');

if (dataIndex === -1) {
throw new Error('Unable to find data section in internal feature states ConfigMap');
}

const stateLines = [];
for (const line of lines.slice(dataIndex + 1)) {
if (!line.startsWith(' ')) {
break;
}

if (line.trim() === '') {
continue;
}

stateLines.push(line);
}

return stateLines
.map((line) => {
const stateMatch = line.match(/^ "([^"]+)": "([^"]+)"$/);
const stateMatch = line.match(/^ "([^"]+)": "([^"]+)"(?:\s+#.*)?$/);
if (!stateMatch) {
throw new Error(`Unable to parse feature state line: ${line}`);
}
Expand Down Expand Up @@ -208,6 +231,14 @@ function rewriteDocs(docsText, releaseTag) {
.replace(
/Defaults follow the upstream v[0-9.]+ Linux deployment manifest\./,
`Defaults follow the upstream ${releaseTag} Linux deployment manifest.`
)
.replace(
/\[Upstream v[0-9.]+ defaults\]/g,
`[Upstream ${releaseTag} defaults]`
)
.replace(
/\[Upstream v[0-9.]+ control-plane node affinity\]/g,
`[Upstream ${releaseTag} control-plane node affinity]`
);
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apiVersion: v1
data:
high-pv-node-density: 'false'
pv-to-backingdiskobjectid-mapping: 'false'
trigger-csi-fullsync: 'false'
kind: ConfigMap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: registry.k8s.io/csi-vsphere/driver:v3.7.0
image: registry.k8s.io/csi-vsphere/driver:v3.7.1
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -164,7 +164,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: registry.k8s.io/csi-vsphere/syncer:v3.7.0
image: registry.k8s.io/csi-vsphere/syncer:v3.7.1
imagePullPolicy: Always
name: vsphere-syncer
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: '1'
image: registry.k8s.io/csi-vsphere/driver:v3.7.0
image: registry.k8s.io/csi-vsphere/driver:v3.7.1
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
apiVersion: v1
data:
high-pv-node-density: 'false'
pv-to-backingdiskobjectid-mapping: 'false'
trigger-csi-fullsync: 'false'
kind: ConfigMap
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: registry.k8s.io/csi-vsphere/driver:v3.7.0
image: registry.k8s.io/csi-vsphere/driver:v3.7.1
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down Expand Up @@ -164,7 +164,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: registry.k8s.io/csi-vsphere/syncer:v3.7.0
image: registry.k8s.io/csi-vsphere/syncer:v3.7.1
imagePullPolicy: Always
name: vsphere-syncer
ports:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ spec:
fieldPath: metadata.namespace
- name: NODEGETINFO_WATCH_TIMEOUT_MINUTES
value: '1'
image: registry.k8s.io/csi-vsphere/driver:v3.7.0
image: registry.k8s.io/csi-vsphere/driver:v3.7.1
imagePullPolicy: Always
livenessProbe:
failureThreshold: 3
Expand Down
Loading