Skip to content

Commit 0161a3a

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #11 from dfajmon/rebase-1.14.0
STOR-1850: Rebase to upstream v1.15.0 for OCP 4.17
2 parents c566fc2 + 8e26a1e commit 0161a3a

File tree

605 files changed

+44539
-25897
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

605 files changed

+44539
-25897
lines changed

‎.snyk‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# References:
2+
# https://docs.snyk.io/scan-applications/snyk-code/using-snyk-code-from-the-cli/excluding-directories-and-files-from-the-snyk-code-cli-test
3+
# https://docs.snyk.io/snyk-cli/commands/ignore
4+
exclude:
5+
global:
6+
- vendor/**
7+
- release-tools/**
8+
- test/**

‎Makefile‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,20 @@ CMDS=smbplugin
1616
PKG = github.com/kubernetes-csi/csi-driver-smb
1717
GINKGO_FLAGS = -ginkgo.v -ginkgo.timeout=2h
1818
GO111MODULE = on
19-
GOPATH ?= $(shell go env GOPATH)
19+
ifndef GOPATH
20+
GOPATH := $(shell go env GOPATH)
21+
endif
2022
GOBIN ?= $(GOPATH)/bin
2123
DOCKER_CLI_EXPERIMENTAL = enabled
2224
IMAGENAME ?= smb-csi
2325
export GOPATH GOBIN GO111MODULE DOCKER_CLI_EXPERIMENTAL
2426

2527
include release-tools/build.make
2628

27-
GIT_COMMIT ?= $(shell git rev-parse HEAD)
29+
GIT_COMMIT := $(shell git rev-parse HEAD)
2830
REGISTRY ?= andyzhangx
29-
REGISTRY_NAME = $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
30-
IMAGE_VERSION ?= v1.14.0
31+
REGISTRY_NAME := $(shell echo $(REGISTRY) | sed "s/.azurecr.io//g")
32+
IMAGE_VERSION ?= v1.15.0
3133
VERSION ?= latest
3234
# Use a custom version for E2E tests if we are testing in CI
3335
ifdef CI
@@ -37,7 +39,9 @@ endif
3739
endif
3840
IMAGE_TAG = $(REGISTRY)/$(IMAGENAME):$(IMAGE_VERSION)
3941
IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGENAME):latest
40-
BUILD_DATE ?= $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
42+
ifndef BUILD_DATE
43+
BUILD_DATE := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
44+
endif
4145
LDFLAGS = -X ${PKG}/pkg/smb.driverVersion=${IMAGE_VERSION} -X ${PKG}/pkg/smb.gitCommit=${GIT_COMMIT} -X ${PKG}/pkg/smb.buildDate=${BUILD_DATE}
4246
EXT_LDFLAGS = -s -w -extldflags "-static"
4347
E2E_HELM_OPTIONS ?= --set image.smb.repository=$(REGISTRY)/$(IMAGENAME) --set image.smb.tag=$(IMAGE_VERSION)

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,20 @@
22
![linux build status](https://github.com/kubernetes-csi/csi-driver-smb/actions/workflows/linux.yaml/badge.svg)
33
![windows build status](https://github.com/kubernetes-csi/csi-driver-smb/actions/workflows/windows.yaml/badge.svg)
44
[![Coverage Status](https://coveralls.io/repos/github/kubernetes-csi/csi-driver-smb/badge.svg?branch=master)](https://coveralls.io/github/kubernetes-csi/csi-driver-smb?branch=master)
5+
[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/csi-driver-smb)](https://artifacthub.io/packages/search?repo=csi-driver-smb)
56

67
### About
7-
This driver allows Kubernetes to access [SMB](https://wiki.wireshark.org/SMB) server on both Linux and Windows nodes, csi plugin name: `smb.csi.k8s.io`. The driver requires existing and already configured SMB server, it supports dynamic provisioning of Persistent Volumes via Persistent Volume Claims by creating a new sub directory under SMB server.
8+
This driver allows Kubernetes to access [SMB](https://wiki.wireshark.org/SMB) server on both Linux and Windows nodes, plugin name: `smb.csi.k8s.io`. The driver requires existing and already configured SMB server, it supports dynamic provisioning of Persistent Volumes via Persistent Volume Claims by creating a new sub directory under SMB server.
89

910
### Project status: GA
1011

1112
### Container Images & Kubernetes Compatibility:
1213
|Driver Version | supported k8s version | supported [Windows csi-proxy](https://github.com/kubernetes-csi/csi-proxy) version |
1314
|---------------|-----------------------|-------------------------------------|
1415
|master branch | 1.21+ | v0.2.2+ |
16+
|v1.15.0 | 1.21+ | v0.2.2+ |
1517
|v1.14.0 | 1.21+ | v0.2.2+ |
1618
|v1.13.0 | 1.21+ | v0.2.2+ |
17-
|v1.12.0 | 1.21+ | v0.2.2+ |
1819

1920
### Driver parameters
2021
Please refer to `smb.csi.k8s.io` [driver parameters](./docs/driver-parameters.md)

‎charts/README.md‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
```console
1717
helm repo add csi-driver-smb https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts
18-
helm install csi-driver-smb csi-driver-smb/csi-driver-smb --namespace kube-system --version v1.14.0
18+
helm install csi-driver-smb csi-driver-smb/csi-driver-smb --namespace kube-system --version v1.15.0
1919
```
2020

2121
### install driver with customized driver name, deployment name
@@ -52,14 +52,13 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
5252
| `image.smb.repository` | csi-driver-smb docker image | `gcr.io/k8s-staging-sig-storage/smbplugin` |
5353
| `image.smb.tag` | csi-driver-smb docker image tag | `canary` |
5454
| `image.smb.pullPolicy` | csi-driver-smb image pull policy | `IfNotPresent` |
55-
| `image.csiProvisioner.repository` | csi-provisioner docker image | `registry.k8s.io/sig-storage/csi-provisioner` |
56-
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v4.0.0` |
55+
| `image.csiProvisioner.tag` | csi-provisioner docker image tag | `v5.0.1` |
5756
| `image.csiProvisioner.pullPolicy` | csi-provisioner image pull policy | `IfNotPresent` |
58-
| `image.livenessProbe.repository` | liveness-probe docker image | `registry.k8s.io/sig-storage/livenessprobe` |
59-
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.12.0` |
57+
| `image.livenessProbe.repository` | liveness-probe docker image | `/livenessprobe` |
58+
| `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.13.1` |
6059
| `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` |
61-
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `registry.k8s.io/sig-storage/csi-node-driver-registrar` |
62-
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.10.0` |
60+
| `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `/csi-node-driver-registrar` |
61+
| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.11.1` |
6362
| `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | `IfNotPresent` |
6463
| `imagePullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
6564
| `serviceAccount.create` | whether create service account of csi-smb-controller | `true` |
@@ -68,7 +67,7 @@ The following table lists the configurable parameters of the latest SMB CSI Driv
6867
| `podAnnotations` | collection of annotations to add to all the pods | `{}` |
6968
| `podLabels` | collection of labels to add to all the pods | `{}` |
7069
| `priorityClassName` | priority class name to be added to pods | `system-cluster-critical` |
71-
| `securityContext` | security context to be added to pods | `{ seccompProfile: {type: RuntimeDefault} }` |
70+
| `securityContext` | security context to be added to pods | `{ seccompProfile: {type: RuntimeDefault} }` |
7271
| `controller.name` | name of driver deployment | `csi-smb-controller` |
7372
| `controller.replicas` | replica num of csi-smb-controller | `1` |
7473
| `controller.dnsPolicy` | dnsPolicy of driver node daemonset, available values: `Default`, `ClusterFirstWithHostNet`, `ClusterFirst` | `ClusterFirstWithHostNet` |

‎charts/artifacthub-repo.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
repositoryID: f8826546-4767-4e66-999c-3ad144141be3
2+
owners:
3+
- name: andyzhangx
4+
email: [email protected]

‎charts/index.yaml‎

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,45 @@
11
apiVersion: v1
22
entries:
33
csi-driver-smb:
4+
- apiVersion: v1
5+
appVersion: v1.15.0
6+
created: "2024-07-18T06:59:59.116464753Z"
7+
description: SMB CSI Driver for Kubernetes
8+
digest: fcadda7e1af1bcfbfd42da9f4a02f6baaa96b0b48bafe7241dc4c5a588d9e4b4
9+
name: csi-driver-smb
10+
urls:
11+
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/latest/csi-driver-smb-v1.15.0.tgz
12+
version: v1.15.0
13+
- apiVersion: v1
14+
appVersion: v1.15.0
15+
created: "2024-07-18T06:59:59.126665562Z"
16+
description: SMB CSI Driver for Kubernetes
17+
digest: fcadda7e1af1bcfbfd42da9f4a02f6baaa96b0b48bafe7241dc4c5a588d9e4b4
18+
name: csi-driver-smb
19+
urls:
20+
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.15.0/csi-driver-smb-v1.15.0.tgz
21+
version: v1.15.0
422
- apiVersion: v1
523
appVersion: v1.14.0
6-
created: "2024-01-16T12:54:43.811609006Z"
24+
created: "2024-07-18T06:59:59.12600989Z"
725
description: SMB CSI Driver for Kubernetes
8-
digest: 1bf19308976f3093dca354ce5ff9b71b7468dc9af2926aa000d07cf919df12ca
26+
digest: 5d63c8c4824b43ad35f498854be6d24a06e3d7c19a50c57dc5c6de26d7f39850
927
name: csi-driver-smb
1028
urls:
1129
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.14.0/csi-driver-smb-v1.14.0.tgz
1230
version: v1.14.0
1331
- apiVersion: v1
1432
appVersion: v1.13.0
15-
created: "2024-01-16T12:54:43.810828295Z"
33+
created: "2024-07-18T06:59:59.124750877Z"
1634
description: SMB CSI Driver for Kubernetes
17-
digest: f0004d3c68899604b0b7ea8672d45163dd3117d0de5db58a202cf7c602dc0c4c
35+
digest: 962ae1f26a13852e86256464e534228ae6118109aeb1e63abbee07ca18809cff
1836
name: csi-driver-smb
1937
urls:
2038
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.13.0/csi-driver-smb-v1.13.0.tgz
2139
version: v1.13.0
2240
- apiVersion: v1
2341
appVersion: v1.12.0
24-
created: "2024-01-16T12:54:43.810073905Z"
42+
created: "2024-07-18T06:59:59.12353098Z"
2543
description: SMB CSI Driver for Kubernetes
2644
digest: eb1f894fa5ad0c20da3b26a3ad4c20857914c8d76a098fd2185ff068d6118ddd
2745
name: csi-driver-smb
@@ -30,7 +48,7 @@ entries:
3048
version: v1.12.0
3149
- apiVersion: v1
3250
appVersion: v1.11.0
33-
created: "2024-01-16T12:54:43.809348063Z"
51+
created: "2024-07-18T06:59:59.122589727Z"
3452
description: SMB CSI Driver for Kubernetes
3553
digest: ab3cab9509579264ed95e49a0ad077019a52a45b4e6cc436de5b1f70c03699ed
3654
name: csi-driver-smb
@@ -39,7 +57,7 @@ entries:
3957
version: v1.11.0
4058
- apiVersion: v1
4159
appVersion: v1.10.0
42-
created: "2024-01-16T12:54:43.808707798Z"
60+
created: "2024-07-18T06:59:59.121823174Z"
4361
description: SMB CSI Driver for Kubernetes
4462
digest: 82e460e6fa80da9ca523a86c28e001e15595d27c3507864f2123dbadc64c7fec
4563
name: csi-driver-smb
@@ -48,7 +66,7 @@ entries:
4866
version: v1.10.0
4967
- apiVersion: v1
5068
appVersion: v1.9.0
51-
created: "2024-01-16T12:54:43.821322235Z"
69+
created: "2024-07-18T06:59:59.135360154Z"
5270
description: SMB CSI Driver for Kubernetes
5371
digest: 5c78c650b9755e508afecb3f6a554c549509023f7b0610b53853a41783d1c08f
5472
name: csi-driver-smb
@@ -57,7 +75,7 @@ entries:
5775
version: v1.9.0
5876
- apiVersion: v1
5977
appVersion: v1.8.0
60-
created: "2024-01-16T12:54:43.819274745Z"
78+
created: "2024-07-18T06:59:59.133499239Z"
6179
description: SMB CSI Driver for Kubernetes
6280
digest: d19d156c2143d753085bcbcb32506f8ebd7ebdee275e726f9c8d774a1f0b9f34
6381
name: csi-driver-smb
@@ -66,7 +84,7 @@ entries:
6684
version: v1.8.0
6785
- apiVersion: v1
6886
appVersion: v1.7.0
69-
created: "2024-01-16T12:54:43.818227935Z"
87+
created: "2024-07-18T06:59:59.132497919Z"
7088
description: SMB CSI Driver for Kubernetes
7189
digest: 65594a1ff09d912a33ee0674bba1fad1f7c717638a281fb68bcfa2c98c288453
7290
name: csi-driver-smb
@@ -75,7 +93,7 @@ entries:
7593
version: v1.7.0
7694
- apiVersion: v1
7795
appVersion: v1.6.0
78-
created: "2024-01-16T12:54:43.817217411Z"
96+
created: "2024-07-18T06:59:59.131558208Z"
7997
description: SMB CSI Driver for Kubernetes
8098
digest: 31dd4c8b0b0d4a61565631aa5b433b18b5375aeb24812bf4fa9958d5b7917485
8199
name: csi-driver-smb
@@ -84,7 +102,7 @@ entries:
84102
version: v1.6.0
85103
- apiVersion: v1
86104
appVersion: v1.5.0
87-
created: "2024-01-16T12:54:43.816225515Z"
105+
created: "2024-07-18T06:59:59.130742188Z"
88106
description: SMB CSI Driver for Kubernetes
89107
digest: b7dc9e9dc5d46df12a6d1a5643efe86439bff6c36867968f772e6899692083d6
90108
name: csi-driver-smb
@@ -93,7 +111,7 @@ entries:
93111
version: v1.5.0
94112
- apiVersion: v1
95113
appVersion: v1.4.0
96-
created: "2024-01-16T12:54:43.815093338Z"
114+
created: "2024-07-18T06:59:59.130135834Z"
97115
description: SMB CSI Driver for Kubernetes
98116
digest: 9b1a6166ab72c09d0eefb448ecc998639b9f6255afb00bfc0ae0a4fdad76f119
99117
name: csi-driver-smb
@@ -102,7 +120,7 @@ entries:
102120
version: v1.4.0
103121
- apiVersion: v1
104122
appVersion: v1.3.0
105-
created: "2024-01-16T12:54:43.81371543Z"
123+
created: "2024-07-18T06:59:59.129292699Z"
106124
description: SMB CSI Driver for Kubernetes
107125
digest: d2236d36f1cb24139ddf87ea87229369ed856efc42330e656330f6cfa7635858
108126
name: csi-driver-smb
@@ -111,7 +129,7 @@ entries:
111129
version: v1.3.0
112130
- apiVersion: v1
113131
appVersion: v1.2.0
114-
created: "2024-01-16T12:54:43.812252057Z"
132+
created: "2024-07-18T06:59:59.12745517Z"
115133
description: SMB CSI Driver for Kubernetes
116134
digest: 9d7099165db24d5412c95b298a59cca9b233ab8800d04efd34bb055812390915
117135
name: csi-driver-smb
@@ -120,7 +138,7 @@ entries:
120138
version: v1.2.0
121139
- apiVersion: v1
122140
appVersion: v1.1.0
123-
created: "2024-01-16T12:54:43.808083237Z"
141+
created: "2024-07-18T06:59:59.120935991Z"
124142
description: SMB CSI Driver for Kubernetes
125143
digest: 5b39613c9104db06815ee2d42fec8507c3bb2038264513449079a4eb5b6530a8
126144
name: csi-driver-smb
@@ -129,7 +147,7 @@ entries:
129147
version: v1.1.0
130148
- apiVersion: v1
131149
appVersion: v1.0.0
132-
created: "2024-01-16T12:54:43.80754826Z"
150+
created: "2024-07-18T06:59:59.120064404Z"
133151
description: SMB CSI Driver for Kubernetes
134152
digest: 3e4721dd007cc51750f7221be8f66ec7e287c83a8cdcfeb9a71c30f526b06dc4
135153
name: csi-driver-smb
@@ -138,7 +156,7 @@ entries:
138156
version: v1.0.0
139157
- apiVersion: v1
140158
appVersion: v0.6.0
141-
created: "2024-01-16T12:54:43.807213899Z"
159+
created: "2024-07-18T06:59:59.119472272Z"
142160
description: SMB CSI Driver for Kubernetes
143161
digest: 6fc9d05bc78ca98fb17071b7f5ad05b4c071f2403114d72feae99fb89ca1fc9f
144162
name: csi-driver-smb
@@ -147,7 +165,7 @@ entries:
147165
version: v0.6.0
148166
- apiVersion: v1
149167
appVersion: v0.5.0
150-
created: "2024-01-16T12:54:43.806921348Z"
168+
created: "2024-07-18T06:59:59.118965554Z"
151169
description: SMB CSI Driver for Kubernetes
152170
digest: 8264c6630806325613234c2d7951c188d073607e6f0f89d781ec32afed04157b
153171
name: csi-driver-smb
@@ -156,7 +174,7 @@ entries:
156174
version: v0.5.0
157175
- apiVersion: v1
158176
appVersion: v0.4.0
159-
created: "2024-01-16T12:54:43.806590172Z"
177+
created: "2024-07-18T06:59:59.118405329Z"
160178
description: SMB CSI Driver for Kubernetes
161179
digest: fb6d581ba5d4d1d78ca468f6daa4a24c47bb147b74d005d3c394521b4e534a3e
162180
name: csi-driver-smb
@@ -165,7 +183,7 @@ entries:
165183
version: v0.4.0
166184
- apiVersion: v1
167185
appVersion: v0.3.0
168-
created: "2024-01-16T12:54:43.806118278Z"
186+
created: "2024-07-18T06:59:59.117892083Z"
169187
description: SMB CSI Driver for Kubernetes
170188
digest: ee9e58db6d4a95491e2012c6607126bbff827b9c439e90e9a9798d2a73b0cb22
171189
name: csi-driver-smb
@@ -174,7 +192,7 @@ entries:
174192
version: v0.3.0
175193
- apiVersion: v1
176194
appVersion: v0.2.0
177-
created: "2024-01-16T12:54:43.805678185Z"
195+
created: "2024-07-18T06:59:59.117254087Z"
178196
description: SMB CSI Driver for Kubernetes
179197
digest: 8d8667106306d78dea9f63e5a3e8ee7ad2b60f86bd625f5968e37ca6a0cad317
180198
name: csi-driver-smb
@@ -183,20 +201,11 @@ entries:
183201
version: v0.2.0
184202
- apiVersion: v1
185203
appVersion: latest
186-
created: "2024-01-16T12:54:43.820298889Z"
204+
created: "2024-07-18T06:59:59.134451894Z"
187205
description: SMB CSI Driver for Kubernetes
188206
digest: 37a15bd85f6f9f2df20aed317d9baa3774128552488d02c2897d561e67777963
189207
name: csi-driver-smb
190208
urls:
191209
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/v1.9.0/csi-driver-smb-v0.0.0.tgz
192210
version: v0.0.0
193-
- apiVersion: v1
194-
appVersion: latest
195-
created: "2024-01-16T12:54:43.805226295Z"
196-
description: SMB CSI Driver for Kubernetes
197-
digest: b21d8c78fbdf5ae78c5e7d6ae755be6e6f6f997ba7431b81239ca4da7169e9fe
198-
name: csi-driver-smb
199-
urls:
200-
- https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts/latest/csi-driver-smb-v0.0.0.tgz
201-
version: v0.0.0
202-
generated: "2024-01-16T12:54:43.804124545Z"
211+
generated: "2024-07-18T06:59:59.115664324Z"

‎charts/latest/csi-driver-smb-v0.0.0.tgz‎

-4.8 KB
Binary file not shown.

‎charts/latest/csi-driver-smb-v1.15.0.tgz‎

4.87 KB
Binary file not shown.

‎charts/latest/csi-driver-smb/Chart.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
apiVersion: v1
2-
appVersion: latest
2+
appVersion: v1.15.0
33
description: SMB CSI Driver for Kubernetes
44
name: csi-driver-smb
5-
version: v0.0.0
5+
version: v1.15.0

0 commit comments

Comments
 (0)