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

[2.8] Fix vsphere secret sync issues #12224

Merged
merged 2 commits into from
Oct 11, 2024
Merged

[2.8] Fix vsphere secret sync issues #12224

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
89fc3fc
reset vsphere credentials when generate secret is off
Oct 10, 2024
66d95d2
remove extra characters from vsphere csi configTemplateString
Oct 10, 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
16 changes: 15 additions & 1 deletion shell/utils/v-sphere.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,13 @@ class VSphereUtils {
const { userValues, combined } = this.findChartValues(rke2Component, 'rancher-vsphere-cpi') || {};

if (!combined?.vCenter?.credentialsSecret?.generate) {
if (userValues?.vCenter?.username) {
userValues.vCenter.username = '';
}
if (userValues?.vCenter?.password) {
userValues.vCenter.password = '';
}

return;
}

Expand Down Expand Up @@ -167,6 +174,13 @@ class VSphereUtils {
const { userValues, combined } = this.findChartValues(rke2Component, 'rancher-vsphere-csi') || {};

if (!combined?.vCenter?.configSecret?.generate) {
if (userValues?.vCenter?.username) {
userValues.vCenter.username = '';
}
if (userValues?.vCenter?.password) {
userValues.vCenter.password = '';
}

return;
}

Expand All @@ -181,7 +195,7 @@ class VSphereUtils {

// This is a copy of https://github.com/rancher/vsphere-charts/blob/a5c99d716df960dc50cf417d9ecffad6b55ca0ad/charts/rancher-vsphere-csi/values.yaml#L12-L21
// Which makes it's way into the secret via https://github.com/rancher/vsphere-charts/blob/main/charts/rancher-vsphere-csi/templates/secret.yaml#L8
let configTemplateString = ' |\n [Global]\n cluster-id = {{ required \".Values.vCenter.clusterId must be provided\" (default .Values.vCenter.clusterId .Values.global.cattle.clusterId) | quote }}\n user = {{ .Values.vCenter.username | quote }}\n password = {{ .Values.vCenter.password | quote }}\n port = {{ .Values.vCenter.port | quote }}\n insecure-flag = {{ .Values.vCenter.insecureFlag | quote }}\n\n [VirtualCenter {{ .Values.vCenter.host | quote }}]\n datacenters = {{ .Values.vCenter.datacenters | quote }}';
let configTemplateString = ' [Global]\n cluster-id = {{ required \".Values.vCenter.clusterId must be provided\" (default .Values.vCenter.clusterId .Values.global.cattle.clusterId) | quote }}\n user = {{ .Values.vCenter.username | quote }}\n password = {{ .Values.vCenter.password | quote }}\n port = {{ .Values.vCenter.port | quote }}\n insecure-flag = {{ .Values.vCenter.insecureFlag | quote }}\n\n [VirtualCenter {{ .Values.vCenter.host | quote }}]\n datacenters = {{ .Values.vCenter.datacenters | quote }}';

configTemplateString = configTemplateString.replace('{{ required \".Values.vCenter.clusterId must be provided\" (default .Values.vCenter.clusterId .Values.global.cattle.clusterId) | quote }}', `"{{clusterId}}"`);
configTemplateString = configTemplateString.replace('{{ .Values.vCenter.username | quote }}', `"${ username }"`);
Expand Down
Loading