From 74457bc6b7de3556317a336238004441add72dba Mon Sep 17 00:00:00 2001 From: Jeremy THERIN Date: Sat, 15 Aug 2020 00:26:10 +0200 Subject: [PATCH 1/3] feat: support project feature --- README.md | 2 +- deploy/kubernetes/scaleway-secret.yaml | 3 ++- go.sum | 2 -- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e385242..d843284 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ These steps will cover how to install the Scaleway CSI driver in your Kubernetes #### Requirements * A Kubernetes cluster running on Scaleway instances (v1.17+) -* Scaleway Organizaton ID, Access and Secret key +* Scaleway Project or Organization ID, Access and Secret key #### Deployment diff --git a/deploy/kubernetes/scaleway-secret.yaml b/deploy/kubernetes/scaleway-secret.yaml index e318b34..936880a 100644 --- a/deploy/kubernetes/scaleway-secret.yaml +++ b/deploy/kubernetes/scaleway-secret.yaml @@ -10,6 +10,7 @@ type: Opaque stringData: SCW_ACCESS_KEY: "YOUR-ACCESS-KEY" SCW_SECRET_KEY: "YOUR-SECRET-KEY" - SCW_DEFAULT_ORGANIZATION_ID: "YOUR-ORGANIZATION-ID" + # Project ID could also be an Organization ID + SCW_DEFAULT_PROJECT_ID: "YOUR-PROJECT-ID" # The default zone where the block volumes will be created, ex: fr-par-1 SCW_DEFAULT_ZONE: "fr-par-1" diff --git a/go.sum b/go.sum index 5587e79..917b049 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200608155405-2c0edbf44628 h1:7sBvEdHVZ+IkOAVh6rizkyQOnCz4xQ5V/qMXqtKF36I= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200608155405-2c0edbf44628/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200608175253-d0adc17352c5 h1:EUEuEITdL9RtVnl0YEzrETOx633hkY7pB6z3ub+6qLE= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200608175253-d0adc17352c5/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= From 53f018fa0736a15c7c120d0fff73f5d4f9d99131 Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Mon, 17 Aug 2020 16:30:11 +0200 Subject: [PATCH 2/3] Add missing go mod files Signed-off-by: Patrik Cyvoct --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9beaae6..0e232df 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/golang/protobuf v1.3.2 github.com/google/uuid v1.1.1 github.com/kubernetes-csi/csi-test/v3 v3.1.0 - github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200608175253-d0adc17352c5 + github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200814130755-648e470a1d42 golang.org/x/sys v0.0.0-20191113165036-4c7a9d0fe056 google.golang.org/grpc v1.25.1 k8s.io/klog v1.0.0 diff --git a/go.sum b/go.sum index 917b049..9805371 100644 --- a/go.sum +++ b/go.sum @@ -41,6 +41,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1: github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200608175253-d0adc17352c5 h1:EUEuEITdL9RtVnl0YEzrETOx633hkY7pB6z3ub+6qLE= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200608175253-d0adc17352c5/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200814130755-648e470a1d42 h1:U4V579TXpwXspEBuEOh4+bDDVLLtMVdQA4sugdKl/QU= +github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200814130755-648e470a1d42/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= From 972c48c24eff102cf23e67c5b4e6a4130a73154c Mon Sep 17 00:00:00 2001 From: Patrik Cyvoct Date: Mon, 17 Aug 2020 16:33:03 +0200 Subject: [PATCH 3/3] tidy Signed-off-by: Patrik Cyvoct --- go.sum | 2 -- 1 file changed, 2 deletions(-) diff --git a/go.sum b/go.sum index 9805371..c7026e6 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,6 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff/go.mod h1:xvqspoSXJTIpemEonrMDFq6XzwHYYgToXWj5eRX1OtY= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200608175253-d0adc17352c5 h1:EUEuEITdL9RtVnl0YEzrETOx633hkY7pB6z3ub+6qLE= -github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200608175253-d0adc17352c5/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200814130755-648e470a1d42 h1:U4V579TXpwXspEBuEOh4+bDDVLLtMVdQA4sugdKl/QU= github.com/scaleway/scaleway-sdk-go v1.0.0-beta.6.0.20200814130755-648e470a1d42/go.mod h1:CJJ5VAbozOl0yEw7nHB9+7BXTJbIn6h7W+f6Gau5IP8= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=