kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scaleway model context + fixed typo in env vars

This commit is contained in:
Leïla MARABESE 2022-10-18 17:19:25 +02:00
parent a32f6ebfc8
commit b00465a796
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/model/bootstrapscript.go
View File

@ -230,13 +230,13 @@ func (b *BootstrapScript) buildEnvironmentVariables(cluster *kops.Cluster) (map[
env["SCW_ACCESS_KEY"] = scwAccessKey
scwSecretKey := os.Getenv("SCW_SECRET_KEY")
if scwSecretKey != "" {
if scwSecretKey == "" {
return nil, fmt.Errorf("SCW_SECRET_KEY has to be set as an environment variable")
}
env["SCW_SECRET_KEY"] = scwSecretKey
scwProjectID := os.Getenv("SCW_DEFAULT_PROJECT_ID")
if scwProjectID != "" {
if scwProjectID == "" {
return nil, fmt.Errorf("SCW_DEFAULT_PROJECT_ID has to be set as an environment variable")
}
env["SCW_DEFAULT_PROJECT_ID"] = scwProjectID

9
pkg/model/scalewaymodel/context.go Normal file
View File

@ -0,0 +1,9 @@
package scalewaymodel
import (
"k8s.io/kops/pkg/model"
)
type ScwModelContext struct {
*model.KopsModelContext
}

4
upup/pkg/fi/cloudup/scaleway/cloud.go
View File

@ -101,11 +101,11 @@ func NewScwCloud(tags map[string]string) (ScwCloud, error) {
return nil, fmt.Errorf("SCW_ACCESS_KEY has to be set as an environment variable")
}
scwSecretKey := os.Getenv("SCW_SECRET_KEY")
if scwSecretKey != "" {
if scwSecretKey == "" {
return nil, fmt.Errorf("SCW_SECRET_KEY has to be set as an environment variable")
}
scwProjectID := os.Getenv("SCW_DEFAULT_PROJECT_ID")
if scwProjectID != "" {
if scwProjectID == "" {
return nil, fmt.Errorf("SCW_DEFAULT_PROJECT_ID has to be set as an environment variable")
}