Skip to content

Commit

Permalink
sign commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@KshitijaKakde
KshitijaKakde committed Jun 10, 2024
1 parent 5319539 commit 681b0a1
Show file tree
Hide file tree
Showing 15 changed files with 163 additions and 153 deletions.
2 changes: 1 addition & 1 deletion config.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ enable = false
url = "https://dell.github.io/csm-docs/docs/"

[[params.versions]]
version = "v1.10.0"
version = "v1.10.2"
url = "https://dell.github.io/csm-docs/v1"

[[params.versions]]
Expand Down
2 changes: 1 addition & 1 deletion content/docs/deployment/csminstallationwizard/src/csm-versions/default-values.properties
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
csmVersion=1.10.1
csmVersion=1.11.0
imageRepository=dellemc
controllerCount=1
nodeSelectorLabel=node-role.kubernetes.io/control-plane:
Expand Down
8 changes: 4 additions & 4 deletions content/docs/deployment/csminstallationwizard/src/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@
<div class="col-sm-9"></div>
<div class="col-sm-3">
<select id="csm-version" class="form-select" onchange="onCSMVersionChange(); validateInput(validateForm, CONSTANTS)" required>
<option value="1.7.0">CSM 1.7</option>
<option value="1.8.0">CSM 1.8</option>
<option value="1.9.3">CSM 1.9</option>
<option value="1.10.1" selected>CSM 1.10.1</option>
<option value="1.8.0">CSM 1.8</option>
<option value="1.9.3">CSM 1.9</option>
<option value="1.10.2">CSM 1.10</option>
<option value="1.11.0" selected>CSM 1.11</option>
</select>
</div>
</div>
Expand Down
6 changes: 3 additions & 3 deletions content/docs/deployment/csminstallationwizard/src/static/js/constants.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ const CONSTANTS = {
PROPERTIES: ".properties",
HELM: "helm",
OPERATOR: "operator",
CSM_HELM_V170: "1.0.0",
CSM_HELM_V180: "1.1.0",
CSM_HELM_V190: "1.2.1",
CSM_HELM_V1101: "1.3.1",
CSM_HELM_V190: "1.2.2",
CSM_HELM_V1102: "1.3.2",
CSM_HELM_V1110: "1.4.0",
HELM_TAINTS: `
- key: "$KEY"
operator: "Exists"
Expand Down
6 changes: 3 additions & 3 deletions content/docs/deployment/csminstallationwizard/src/static/js/tests/generate-yaml.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ const CONSTANTS = {
PROPERTIES: ".properties",
HELM: "helm",
OPERATOR: "operator",
CSM_HELM_V170: "1.0.0",
CSM_HELM_V180: "1.1.0",
CSM_HELM_V190: "1.2.0",
CSM_HELM_V1100: "1.3.0",
CSM_HELM_V190: "1.2.2",
CSM_HELM_V1102: "1.3.2",
CSM_HELM_V1110: "1.4.0",
HELM_TAINTS: `
- key: "$KEY"
operator: "Exists"
Expand Down
10 changes: 5 additions & 5 deletions content/docs/deployment/csminstallationwizard/src/static/js/tests/ui-functions.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ const CONSTANTS = {
PROPERTIES: ".properties",
HELM: "helm",
OPERATOR: "operator",
CSM_HELM_V170: "1.0.0",
CSM_HELM_V180: "1.1.0",
CSM_HELM_V190: "1.2.0",
CSM_HELM_V1100: "1.3.0",
CSM_HELM_V190: "1.2.2",
CSM_HELM_V1102: "1.3.2",
CSM_HELM_V1110: "1.4.0",
};

describe("GIVEN onAuthorizationChange function", () => {
Expand Down Expand Up @@ -718,7 +718,7 @@ describe("GIVEN displayCommands function", () => {
<input id="array" value="powerstore">
<input id="installation-type" value="helm">
<input type="text" id="driver-namespace" value="csi-powerstore">
<input type="text" id="csm-version" value="1.7.0">
<input type="text" id="csm-version" value="1.8.0">
<div id="command-text-area" style="display:none">
<div id="command-title"></div>
<span id="command-note" style="display:none"></span>
Expand All @@ -733,7 +733,7 @@ describe("GIVEN displayCommands function", () => {
expect($("#command-title").text()).toEqual("Run the following commands to install");
expect($("#command-note").text()).toEqual("Ensure that the namespaces and secrets are created before installing the helm chart");
expect($("#command1").text()).toEqual("helm repo add dell https://dell.github.io/helm-charts");
expect($("#command2").text()).toEqual("helm install powerstore dell/container-storage-modules -n csi-powerstore --version 1.0.0 -f values.yaml");
expect($("#command2").text()).toEqual("helm install powerstore dell/container-storage-modules -n csi-powerstore --version 1.1.0 -f values.yaml");
});

test("SHOULD show expected commands: Installation Type: Operator", () => {
Expand Down
6 changes: 3 additions & 3 deletions content/docs/deployment/csminstallationwizard/src/static/js/tests/utility.test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ const CONSTANT_PARAM = {
PROPERTIES: ".properties",
HELM: "helm",
OPERATOR: "operator",
CSM_HELM_V170: "1.0.0",
CSM_HELM_V180: "1.1.0",
CSM_HELM_V190: "1.2.0",
CSM_HELM_V1100: "1.3.0",
CSM_HELM_V190: "1.2.2",
CSM_HELM_V1102: "1.3.2",
CSM_HELM_V1110: "1.4.0",
HELM_TAINTS: `
- key: "$KEY"
operator: "Exists"
Expand Down
16 changes: 8 additions & 8 deletions content/docs/deployment/csminstallationwizard/src/static/js/ui-functions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,20 +470,20 @@ function displayCommands(releaseNameValue, commandTitleValue, commandNoteValue,
installationType = document.getElementById("installation-type").value
var helmChartVersion;
switch (csmVersion) {
case "1.7.0":
helmChartVersion = CONSTANTS.CSM_HELM_V170;
break;
case "1.8.0":
helmChartVersion = CONSTANTS.CSM_HELM_V180;
break;
case "1.9.3":
helmChartVersion = CONSTANTS.CSM_HELM_V193;
case "1.9.0":
helmChartVersion = CONSTANTS.CSM_HELM_V190;
break;
case "1.10.2":
helmChartVersion = CONSTANTS.CSM_HELM_V1102;
break;
case "1.10.1":
helmChartVersion = CONSTANTS.CSM_HELM_V1101;
case "1.11.0":
helmChartVersion = CONSTANTS.CSM_HELM_V1100;
break;
default:
helmChartVersion = CONSTANTS.CSM_HELM_V1101;
helmChartVersion = CONSTANTS.CSM_HELM_V1100;
break;
}
$("#command-text-area").show();
Expand Down
76 changes: 38 additions & 38 deletions content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.11.0-values.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ csi-powerstore:
# "driver" defines the container image, used for the driver container.
driver: dellemc/csi-powerstore:v2.11.0
# CSI sidecars
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0

# CSM sidecars
replication: dellemc/dell-csi-replicator:v1.9.0
vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.4.0
vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.6.0
podmon: dellemc/podmon:v1.10.0
metadataretriever: dellemc/csi-metadata-retriever:v1.6.0
metadataretriever: dellemc/csi-metadata-retriever:v1.8.0
## Controller ATTRIBUTES
controller:
controllerCount: $CONTROLLER_COUNT
Expand Down Expand Up @@ -118,17 +118,17 @@ csi-powermax:
images:
# "driver" defines the container image, used for the driver container.
driver: dellemc/csi-powermax:v2.11.0
csireverseproxy: dellemc/csipowermax-reverseproxy:v2.9.0
csireverseproxy: dellemc/csipowermax-reverseproxy:v2.10.0
# CSI sidecars
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0
# CSM sidecars
replication: dellemc/dell-csi-replicator:v1.9.0
authorization: dellemc/csm-authorization-sidecar:v1.10.0
authorization: dellemc/csm-authorization-sidecar:v1.11.0
migration: dellemc/dell-csi-migrator:v1.3.0
noderescan: dellemc/dell-csi-node-rescanner:v1.2.0
clusterPrefix: $POWERMAX_CLUSTER_PREFIX
Expand Down Expand Up @@ -223,17 +223,17 @@ csi-vxflexos:
# "powerflexSdc" defines the SDC image for init container.
powerflexSdc: dellemc/sdc:4.5
# CSI sidecars
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0
# CSM sidecars
replication: dellemc/dell-csi-replicator:v1.9.0
vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.4.0
vgsnapshotter: dellemc/csi-volumegroup-snapshotter:v1.6.0
podmon: dellemc/podmon:v1.10.0
authorization: dellemc/csm-authorization-sidecar:v1.10.0
authorization: dellemc/csm-authorization-sidecar:v1.11.0
certSecretCount: $CERT_SECRET_COUNT
controller:
replication:
Expand Down Expand Up @@ -320,17 +320,17 @@ csi-isilon:
# "driver" defines the container image, used for the driver container.
driver: dellemc/csi-isilon:v2.11.0
# CSI sidecars
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0
# CSM sidecars
replication: dellemc/dell-csi-replicator:v1.9.0
podmon: dellemc/podmon:v1.10.0
authorization: dellemc/csm-authorization-sidecar:v1.10.0
metadataretriever: dellemc/csi-metadata-retriever:v1.4.0
authorization: dellemc/csm-authorization-sidecar:v1.11.0
metadataretriever: dellemc/csi-metadata-retriever:v1.8.0
encryption: dellemc/csm-encryption:v0.3.0

certSecretCount: $CERT_SECRET_COUNT
Expand Down Expand Up @@ -430,12 +430,12 @@ csi-unity:
# "driver" defines the container image, used for the driver container.
driver: dellemc/csi-unity:v2.11.0
# CSI sidecars
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.0
provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.0
snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.0
resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.0
registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.11.0
healthmonitor: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.0
# CSM sidecars
podmon: dellemc/podmon:v1.10.0
certSecretCount: $CERT_SECRET_COUNT
Expand Down
20 changes: 10 additions & 10 deletions ...t/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.11.0.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,11 +165,11 @@ spec:
# Leave as blank to consider all nodes
# Allowed values: map of key-value pairs
# Default value: None
nodeSelector:$CONTROLLER_POD_NODE_SELECTOR
nodeSelector: $CONTROLLER_POD_NODE_SELECTOR

# tolerations: Define tolerations for the controller deployment, if required.
# Default value: None
tolerations:$CONTROLLER_TOLERATIONS
tolerations: $CONTROLLER_TOLERATIONS

node:
envs:
Expand Down Expand Up @@ -212,11 +212,11 @@ spec:
# Leave as blank to consider all nodes
# Allowed values: map of key-value pairs
# Default value: None
nodeSelector:$NODE_POD_NODE_SELECTOR
nodeSelector: $NODE_POD_NODE_SELECTOR

# tolerations: Define tolerations for the node daemonset, if required.
# Default value: None
tolerations:$NODE_TOLERATIONS
tolerations: $NODE_TOLERATIONS
# - key: "node.kubernetes.io/memory-pressure"
# operator: "Exists"
# effect: "NoExecute"
Expand Down Expand Up @@ -245,10 +245,10 @@ spec:
- name: authorization
# enable: Enable/Disable csm-authorization
enabled: $AUTHORIZATION_ENABLED
configVersion: v1.10.0
configVersion: v1.11.0
components:
- name: karavi-authorization-proxy
image: dellemc/csm-authorization-sidecar:v1.10.0
image: dellemc/csm-authorization-sidecar:v1.11.0
envs:
# proxyHost: hostname of the csm-authorization server
- name: "PROXY_HOST"
Expand Down Expand Up @@ -289,7 +289,7 @@ spec:
- name: dell-replication-controller-manager
# image: Defines controller image. This shouldn't be changed
# Allowed values: string
image: dellemc/dell-replication-controller:v1.7.0
image: dellemc/dell-replication-controller:v1.9.0
envs:
# TARGET_CLUSTERS_IDS: comma separated list of cluster IDs of the targets clusters. DO NOT include the source(wherever CSM Operator is deployed) cluster ID
# Set the value to "self" in case of stretched/single cluster configuration
Expand Down Expand Up @@ -321,14 +321,14 @@ spec:
- name: observability
# enabled: Enable/Disable observability
enabled: $OBSERVABILITY_OPERATOR_ENABLED
configVersion: v1.7.0
configVersion: v1.9.0
components:
- name: topology
# enabled: Enable/Disable topology
enabled: $OBSERVABILITY_OPERATOR_TOPOLOGY
# image: Defines karavi-topology image. This shouldn't be changed
# Allowed values: string
image: dellemc/csm-topology:v1.7.0
image: dellemc/csm-topology:v1.9.0
envs:
# topology log level
# Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
Expand Down Expand Up @@ -362,7 +362,7 @@ spec:
enabled: $OBSERVABILITY_OPERATOR_METRICS
# image: Defines PowerScale metrics image. This shouldn't be changed
# Allowed values: string
image: dellemc/csm-metrics-powerscale:v1.4.0
image: dellemc/csm-metrics-powerscale:v1.6.0
envs:
# POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale
# Allowed values: int
Expand Down
14 changes: 7 additions & 7 deletions ...docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.11.0.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -232,14 +232,14 @@ spec:
- name: csireverseproxy
# enabled: Always set to true
enabled: true
configVersion: v2.9.0
configVersion: v2.10.0
forceRemoveModule: true
components:
- name: csipowermax-reverseproxy
# image: Define the container images used for the reverse proxy
# Default value: None
# Example: "csipowermax-reverseproxy:v2.9.0"
image: dellemc/csipowermax-reverseproxy:v2.9.0
# Example: "csipowermax-reverseproxy:v2.10.0"
image: dellemc/csipowermax-reverseproxy:v2.10.0
envs:
# "tlsSecret" defines the TLS secret that is created with certificate
# and its associated key
Expand Down Expand Up @@ -299,7 +299,7 @@ spec:
- name: dell-replication-controller-manager
# image: Defines controller image. This shouldn't be changed
# Allowed values: string
image: dellemc/dell-replication-controller:v1.7.0
image: dellemc/dell-replication-controller:v1.9.0
envs:
# TARGET_CLUSTERS_IDS: comma separated list of cluster IDs of the targets clusters. DO NOT include the source(wherever CSM Operator is deployed) cluster ID
# Set the value to "self" in case of stretched/single cluster configuration
Expand Down Expand Up @@ -330,14 +330,14 @@ spec:
- name: observability
# enabled: Enable/Disable observability
enabled: $OBSERVABILITY_OPERATOR_ENABLED
configVersion: v1.7.0
configVersion: v1.9.0
components:
- name: topology
# enabled: Enable/Disable topology
enabled: $OBSERVABILITY_OPERATOR_TOPOLOGY
# image: Defines karavi-topology image. This shouldn't be changed
# Allowed values: string
image: dellemc/csm-topology:v1.7.0
image: dellemc/csm-topology:v1.9.0
envs:
# topology log level
# Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
Expand All @@ -362,7 +362,7 @@ spec:
# enabled: Enable/Disable PowerMax metrics
enabled: $OBSERVABILITY_OPERATOR_METRICS
# image: Defines PowerMax metrics image. This shouldn't be changed
image: dellemc/csm-metrics-powermax:v1.2.0
image: dellemc/csm-metrics-powermax:v1.4.0
envs:
# POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax
# Allowed values: int
Expand Down
Loading

0 comments on commit 681b0a1

Please sign in to comment.