diff --git a/Makefile b/Makefile index c100bd1..5759250 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ REGISTRY_NAME=synology IMAGE_NAME=synology-csi -IMAGE_VERSION=v1.1.1 +IMAGE_VERSION=v1.1.2 IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION) # For now, only build linux/amd64 platform diff --git a/README.md b/README.md index cb21852..57e9646 100644 --- a/README.md +++ b/README.md @@ -6,10 +6,7 @@ The official [Container Storage Interface](https://github.com/container-storage- Driver Name: csi.san.synology.com | Driver Version | Image | Supported K8s Version | | -------------------------------------------------------------------------------- | --------------------------------------------------------------------- | --------------------- | -| [v1.1.1](https://github.com/SynologyOpenSource/synology-csi/tree/release-v1.1.1) | [synology-csi:v1.1.1](https://hub.docker.com/r/synology/synology-csi) | 1.20+ | -| [v1.1.0](https://github.com/SynologyOpenSource/synology-csi/tree/release-v1.1.0) | [synology-csi:v1.1.0](https://hub.docker.com/r/synology/synology-csi) | 1.20+ | -| [v1.0.1](https://github.com/SynologyOpenSource/synology-csi/tree/release-v1.0.1) | [synology-csi:v1.0.1](https://hub.docker.com/r/synology/synology-csi) | 1.20+ | -| [v1.0.0](https://github.com/SynologyOpenSource/synology-csi/tree/release-v1.0.0) | [synology-csi:v1.0.0](https://hub.docker.com/r/synology/synology-csi) | 1.19 | +| [v1.1.2](https://github.com/SynologyOpenSource/synology-csi/tree/release-v1.1.2) | [synology-csi:v1.1.2](https://hub.docker.com/r/synology/synology-csi) | 1.20+ | @@ -43,25 +40,31 @@ The Synology CSI driver supports: - *https*: Set "true" to use HTTPS for secure connections. Make sure the port is properly configured as well. - *username*, *password*: The credentials for connecting to DSM. -5. Run `./scripts/deploy.sh run` to install the driver. This will be a *full* deployment, which means you'll be building and running all CSI services as well as the snapshotter. If you want a *basic* deployment, which doesn't include installing a snapshotter, change the command as instructed below. - - *full*: - `./scripts/deploy.sh run` - - *basic*: - `./scripts/deploy.sh build && ./scripts/deploy.sh install --basic` +5. Install + * **YAML** + Run `./scripts/deploy.sh run` to install the driver. This will be a *full* deployment, which means you'll be building and running all CSI services as well as the snapshotter. If you want a *basic* deployment, which doesn't include installing a snapshotter, change the command as instructed below. + - *full*: + `./scripts/deploy.sh run` + - *basic*: + `./scripts/deploy.sh build && ./scripts/deploy.sh install --basic` - If you don’t need to build the driver locally and want to pull the [image](https://hub.docker.com/r/synology/synology-csi) from Docker instead, run the command as instructed below. + If you don’t need to build the driver locally and want to pull the [image](https://hub.docker.com/r/synology/synology-csi) from Docker instead, run the command as instructed below. - - *full*: - `./scripts/deploy.sh install --all` - - *basic*: - `./scripts/deploy.sh install --basic` + - *full*: + `./scripts/deploy.sh install --all` + - *basic*: + `./scripts/deploy.sh install --basic` - Running the bash script will: - - Create a namespace named "`synology-csi`". This is where the driver will be installed. - - Create a secret named "`client-info-secret`" using the credentials from the client-info.yml you configured in the previous step. - - Build a local image and deploy the CSI driver. - - Create a **default** storage class named "`synology-iscsi-storage`" that uses the "`Retain`" policy. - - Create a volume snapshot class named "`synology-snapshotclass`" that uses the "`Delete`" policy. (*Full* deployment only) + Running the bash script will: + - Create a namespace named "`synology-csi`". This is where the driver will be installed. + - Create a secret named "`client-info-secret`" using the credentials from the client-info.yml you configured in the previous step. + - Build a local image and deploy the CSI driver. + - Create a **default** storage class named "`synology-iscsi-storage`" that uses the "`Retain`" policy. + - Create a volume snapshot class named "`synology-snapshotclass`" that uses the "`Delete`" policy. (*Full* deployment only) + * **HELM** (Local Development) + 1. `kubectl create ns synology-csi` + 2. `kubectl create secret -n synology-csi generic client-info-secret --from-file=./config/client-info.yml` + 3. `cd deploy/helm; make up` 6. Check if the status of all pods of the CSI driver is Running. `kubectl get pods -n synology-csi` diff --git a/deploy/helm/Chart.yaml b/deploy/helm/Chart.yaml index 165b5a6..ee6a4c3 100644 --- a/deploy/helm/Chart.yaml +++ b/deploy/helm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: v1.1.1 +appVersion: v1.1.2 name: synology-csi description: A Helm chart for the Synology CSI Driver keywords: diff --git a/deploy/kubernetes/v1.19/controller.yml b/deploy/kubernetes/v1.19/controller.yml index 9ad6922..2c4fab8 100644 --- a/deploy/kubernetes/v1.19/controller.yml +++ b/deploy/kubernetes/v1.19/controller.yml @@ -143,7 +143,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: synology/synology-csi:v1.1.1 + image: synology/synology-csi:v1.1.2 args: - --nodeid=NotUsed - --endpoint=$(CSI_ENDPOINT) diff --git a/deploy/kubernetes/v1.19/node.yml b/deploy/kubernetes/v1.19/node.yml index 9e41d8c..b1c3069 100644 --- a/deploy/kubernetes/v1.19/node.yml +++ b/deploy/kubernetes/v1.19/node.yml @@ -86,7 +86,7 @@ spec: securityContext: privileged: true imagePullPolicy: IfNotPresent - image: synology/synology-csi:v1.1.1 + image: synology/synology-csi:v1.1.2 args: - --nodeid=$(KUBE_NODE_NAME) - --endpoint=$(CSI_ENDPOINT) diff --git a/deploy/kubernetes/v1.19/snapshotter/snapshotter.yaml b/deploy/kubernetes/v1.19/snapshotter/snapshotter.yaml index 80e2baf..19d568a 100644 --- a/deploy/kubernetes/v1.19/snapshotter/snapshotter.yaml +++ b/deploy/kubernetes/v1.19/snapshotter/snapshotter.yaml @@ -81,7 +81,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: synology/synology-csi:v1.1.1 + image: synology/synology-csi:v1.1.2 args: - --nodeid=NotUsed - --endpoint=$(CSI_ENDPOINT) diff --git a/deploy/kubernetes/v1.20/controller.yml b/deploy/kubernetes/v1.20/controller.yml index c01b397..f651dff 100644 --- a/deploy/kubernetes/v1.20/controller.yml +++ b/deploy/kubernetes/v1.20/controller.yml @@ -143,7 +143,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: synology/synology-csi:v1.1.1 + image: synology/synology-csi:v1.1.2 args: - --nodeid=NotUsed - --endpoint=$(CSI_ENDPOINT) diff --git a/deploy/kubernetes/v1.20/node.yml b/deploy/kubernetes/v1.20/node.yml index 9e41d8c..b1c3069 100644 --- a/deploy/kubernetes/v1.20/node.yml +++ b/deploy/kubernetes/v1.20/node.yml @@ -86,7 +86,7 @@ spec: securityContext: privileged: true imagePullPolicy: IfNotPresent - image: synology/synology-csi:v1.1.1 + image: synology/synology-csi:v1.1.2 args: - --nodeid=$(KUBE_NODE_NAME) - --endpoint=$(CSI_ENDPOINT) diff --git a/deploy/kubernetes/v1.20/snapshotter/snapshotter.yaml b/deploy/kubernetes/v1.20/snapshotter/snapshotter.yaml index fd6bcd3..b422143 100644 --- a/deploy/kubernetes/v1.20/snapshotter/snapshotter.yaml +++ b/deploy/kubernetes/v1.20/snapshotter/snapshotter.yaml @@ -81,7 +81,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: synology/synology-csi:v1.1.1 + image: synology/synology-csi:v1.1.2 args: - --nodeid=NotUsed - --endpoint=$(CSI_ENDPOINT) diff --git a/pkg/driver/driver.go b/pkg/driver/driver.go index 1c1ab38..713e513 100644 --- a/pkg/driver/driver.go +++ b/pkg/driver/driver.go @@ -25,7 +25,7 @@ import ( const ( DriverName = "csi.san.synology.com" // CSI dirver name - DriverVersion = "1.1.1" + DriverVersion = "1.1.2" ) var (