Skip to content

Commit

Permalink
Merge branch 'release-v1.14.0' into usr/spark/proxy-secret
Browse files Browse the repository at this point in the history
  • Loading branch information
lukeatdell committed Jan 17, 2025
2 parents ccc1865 + 4d2d3ae commit 39af22e
Show file tree
Hide file tree
Showing 30 changed files with 188 additions and 176 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/post-release-action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
# Needed for signing commits using Github App tokens
# See: https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#commit-signing
- uses: actions/[email protected].0
- uses: actions/[email protected].1
id: generate-token
with:
app-id: ${{ vars.CSM_RELEASE_APP_ID }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rebase-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
# Needed for signing commits using Github App tokens
# See: https://github.com/peter-evans/create-pull-request/blob/main/docs/concepts-guidelines.md#commit-signing
- uses: actions/[email protected].0
- uses: actions/[email protected].1
id: generate-token
if: ${{ success() && steps.rebase.outcome == 'success' }}
with:
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-isilon/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: csi-isilon
version: 2.12.0
appVersion: "2.12.0"
version: 2.13.0
appVersion: "2.13.0"
kubeVersion: ">= 1.21.0"
# If you are using a complex K8s version like "v1.22.3-mirantis-1", use this kubeVersion check instead
# kubeVersion: ">= 1.23.0-0"
Expand Down
22 changes: 11 additions & 11 deletions charts/csi-isilon/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,35 @@
########################
# version: version of this values file
# Note: Do not change this value
version: "v2.12.0"
version: "v2.13.0"

images:
# "driver" defines the container image, used for the driver container.
driver:
image: quay.io/dell/container-storage-modules/csi-isilon:v2.12.0
image: quay.io/dell/container-storage-modules/csi-isilon:v2.13.0
# CSI sidecars
attacher:
image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
provisioner:
image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
snapshotter:
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
resizer:
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
registrar:
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
healthmonitor:
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.14.0

# CSM sidecars
replication:
image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0
image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.11.0
podmon:
image: quay.io/dell/container-storage-modules/podmon:v1.11.0
image: quay.io/dell/container-storage-modules/podmon:v1.12.0
authorization:
image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0
image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v2.1.0
metadataretriever:
image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0
image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.10.0

# CSI driver log level
# Allowed values: "error", "warn"/"warning", "info", "debug"
Expand Down
6 changes: 3 additions & 3 deletions charts/csi-powermax/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: "2.12.0"
appVersion: "2.13.0"
name: csi-powermax
version: 2.12.0
version: 2.13.0
description: |
PowerMax CSI (Container Storage Interface) driver Kubernetes
integration. This chart includes everything required to provision via CSI as
Expand All @@ -15,7 +15,7 @@ keywords:
- storage
dependencies:
- name: csireverseproxy
version: 2.11.0
version: 2.12.0
condition: required
home: https://github.com/dell/csi-powermax
icon: https://avatars1.githubusercontent.com/u/20958494?s=200&v=4
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-powermax/charts/csireverseproxy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ description: A Helm chart for CSI PowerMax ReverseProxy

type: application

version: 2.11.0
version: 2.12.0

appVersion: 2.11.0
appVersion: 2.12.0
5 changes: 2 additions & 3 deletions charts/csi-powermax/charts/csireverseproxy/conf/config.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
mode: "StandAlone"
port: {{ .Values.port }}
logLevel: {{ .Values.global.logLevel | default "debug" }}
logFormat: {{ .Values.global.logFormat | default "TEXT" }}
standAloneConfig:
config:
{{- $defaultProxyCreds := .Values.global.defaultCredentialsSecret }}
storageArrays:
{{- $_ := first .Values.global.storageArrays }}
Expand Down Expand Up @@ -36,4 +35,4 @@ standAloneConfig:
maxOutStandingRead: {{ $value.limits.maxOutStandingRead | default 0 }}
maxOutStandingWrite: {{ $value.limits.maxOutStandingWrite | default 0 }}
{{- end }}
{{- end }}
{{- end }}
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ spec:
- powermax-reverseproxy
- powermax-reverseproxy.powermax.svc.cluster.local
- reverseproxy
ipAddresses:
- 0.0.0.0
issuerRef:
{{- if ne .Values.certManager.selfSignedCert true }}
name: csirevproxy-issuer
Expand Down
2 changes: 1 addition & 1 deletion charts/csi-powermax/charts/csireverseproxy/values.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0
image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.12.0
port: 2222

# TLS secret which is used for setting up the proxy HTTPS server
Expand Down
4 changes: 4 additions & 0 deletions charts/csi-powermax/templates/controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,8 @@ spec:
{{- end }}
- name: X_CSI_PODMON_API_PORT
value: "{{ .Values.podmon.podmonAPIPort }}"
- name: X_CSI_REVPROXY_TLS_CERT_DIR
value: /app/tls
volumeMounts:
- name: socket-dir
mountPath: /var/run/csi
Expand All @@ -522,6 +524,8 @@ spec:
- name: powermax-reverseproxy-secret
mountPath: /etc/powermax
{{- end }}
- name: tls-secret
mountPath: /app/tls
{{- if eq .Values.csireverseproxy.deployAsSidecar true }}
- name: reverseproxy
image: {{ required "Must provided an image for reverseproxy container." .Values.images.csireverseproxy.image }}
Expand Down
7 changes: 7 additions & 0 deletions charts/csi-powermax/templates/node.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,8 @@ spec:
{{- end }}
- name: X_CSI_PODMON_API_PORT
value: "{{ .Values.podmon.podmonAPIPort }}"
- name: X_CSI_REVPROXY_TLS_CERT_DIR
value: /app/tls
volumeMounts:
- name: driver-path
mountPath: {{ .Values.kubeletConfigDir }}/plugins/powermax.emc.dell.com
Expand Down Expand Up @@ -297,6 +299,8 @@ spec:
- name: powermax-reverseproxy-secret
mountPath: /etc/powermax
{{- end }}
- name: tls-secret
mountPath: /app/tls
- name: registrar
image: {{ required "Must provide the CSI node registrar container image." .Values.images.registrar.image }}
args:
Expand Down Expand Up @@ -525,3 +529,6 @@ spec:
hostPath:
path: /var/run
type: Directory
- name: tls-secret
secret:
secretName: {{ .Values.csireverseproxy.tlsSecret }}
26 changes: 13 additions & 13 deletions charts/csi-powermax/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -82,41 +82,41 @@ global:

# Current version of the driver
# Don't modify this value as this value will be used by the install script
version: "v2.12.0"
version: "v2.13.0"

# "images" defines every container images used for the driver and its sidecars.
# To use your own images, or a private registry, change the values here.
images:
# "driver" defines the container image, used for the driver container.
driver:
image: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0
image: quay.io/dell/container-storage-modules/csi-powermax:v2.13.0
csireverseproxy:
image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0
image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.12.0
# CSI sidecars
attacher:
image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
provisioner:
image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
snapshotter:
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
resizer:
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
registrar:
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
healthmonitor:
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.14.0
# CSM sidecars
replication:
image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0
image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.11.0
authorization:
image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0
image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v2.1.0
migration:
image: quay.io/dell/container-storage-modules/dell-csi-migrator:v1.6.0
image: quay.io/dell/container-storage-modules/dell-csi-migrator:v1.7.0
podmon:
image: quay.io/dell/container-storage-modules/podmon:v1.11.0
image: quay.io/dell/container-storage-modules/podmon:v1.12.0
# Node rescan sidecar does a rescan on nodes for identifying new paths
noderescan:
image: quay.io/dell/container-storage-modules/dell-csi-node-rescanner:v1.5.0
image: quay.io/dell/container-storage-modules/dell-csi-node-rescanner:v1.6.0
## K8S/DRIVER ATTRIBUTES
########################
# customDriverName: If enabled, sets the driver name to the
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-powerstore/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: "2.12.0"
appVersion: "2.13.0"
name: csi-powerstore
version: 2.12.0
version: 2.13.0
description: |
PowerStore CSI (Container Storage Interface) driver Kubernetes
integration. This chart includes everything required to provision via CSI as
Expand Down
22 changes: 11 additions & 11 deletions charts/csi-powerstore/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,37 @@
driverName: "csi-powerstore.dellemc.com"
# "version" is used to verify the values file matches driver version
# Not recommend to change
version: v2.12.0
version: v2.13.0

# "images" defines every container images used for the driver and its sidecars.
# To use your own images, or a private registry, change the values here.
images:
# "driver" defines the container image, used for the driver container.
driver:
image: quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0
image: quay.io/dell/container-storage-modules/csi-powerstore:v2.13.0
# CSI sidecars
attacher:
image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
provisioner:
image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
snapshotter:
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
resizer:
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
registrar:
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
healthmonitor:
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.14.0

# CSM sidecars
replication:
image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0
image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.11.0
vgsnapshotter:
image: quay.io/dell/container-storage-modules/csi-volumegroup-snapshotter:v1.7.0
image: quay.io/dell/container-storage-modules/csi-volumegroup-snapshotter:v1.8.1
podmon:
image: quay.io/dell/container-storage-modules/podmon:v1.11.0
image: quay.io/dell/container-storage-modules/podmon:v1.12.0
metadataretriever:
image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0
image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.10.0

# Specify kubelet config dir path.
# Ensure that the config.yaml file is present at this path.
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-unity/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: 2.12.0
appVersion: 2.13.0
name: csi-unity
version: 2.12.0
version: 2.13.0
description: |
Unity XT CSI (Container Storage Interface) driver Kubernetes
integration. This chart includes everything required to provision via CSI as
Expand Down
16 changes: 8 additions & 8 deletions charts/csi-unity/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,29 @@
# version: version of this values file
# Note: Do not change this value
# Examples : "v2.9.0" , "nightly"
version: "v2.12.0"
version: "v2.13.0"

images:
# "driver" defines the container image, used for the driver container.
driver:
image: quay.io/dell/container-storage-modules/csi-unity:v2.12.0
image: quay.io/dell/container-storage-modules/csi-unity:v2.13.0
# CSI sidecars
attacher:
image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
image: registry.k8s.io/sig-storage/csi-attacher:v4.8.0
provisioner:
image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
snapshotter:
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
image: registry.k8s.io/sig-storage/csi-snapshotter:v8.2.0
resizer:
image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
image: registry.k8s.io/sig-storage/csi-resizer:v1.13.1
registrar:
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.13.0
healthmonitor:
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.14.0

# CSM sidecars
podmon:
image: quay.io/dell/container-storage-modules/podmon:v1.11.0
image: quay.io/dell/container-storage-modules/podmon:v1.12.0

# LogLevel is used to set the logging level of the driver.
# Allowed values: "error", "warn"/"warning", "info", "debug"
Expand Down
4 changes: 2 additions & 2 deletions charts/csi-vxflexos/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
appVersion: "2.12.0"
appVersion: "2.13.0"
name: csi-vxflexos
version: "2.12.0"
version: "2.13.0"
description: |
VxFlex OS CSI (Container Storage Interface) driver Kubernetes
integration. This chart includes everything required to provision via CSI as
Expand Down
Loading

0 comments on commit 39af22e

Please sign in to comment.