Skip to content

Commit 2fc6761

Browse files
committed
fix mission region
1 parent 9d644b4 commit 2fc6761

2 files changed

Lines changed: 12 additions & 3 deletions

File tree

cmd/stackit-csi-plugin/main.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,11 @@ func handle() {
103103
iaasOpts = append(iaasOpts, sdkconfig.WithEndpoint(cfg.Global.APIEndpoints.IaasAPI))
104104
}
105105

106-
iaasClient, err := stackitclient.New(cfg.Global.Region, cfg.Global.ProjectID).IaaS(iaasOpts)
106+
region := os.Getenv("STACKIT_REGION")
107+
if region == "" {
108+
klog.Fatalf("The environment variable STACKIT_REGION must be set to the region of the cluster")
109+
}
110+
iaasClient, err := stackitclient.New(region, cfg.Global.ProjectID).IaaS(iaasOpts)
107111
if err != nil {
108112
klog.Fatalf("Failed to create STACKIT stackitclient: %v", err)
109113
}

pkg/ccm/stackit.go

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,12 @@ func NewCloudControllerManager(cfg *stackitconfig.CCMConfig, obs *MetricsRemoteW
133133
lbOpts = append(lbOpts, sdkconfig.WithToken(lbEmergencyAPIToken))
134134
}
135135

136-
loadbalancingClient, err := stackitclient.New(cfg.Global.Region, cfg.Global.ProjectID).LoadBalancing(lbOpts)
136+
region := os.Getenv("STACKIT_REGION")
137+
if region == "" {
138+
return nil, fmt.Errorf("STACKIT_REGION environment variable must be set")
139+
}
140+
141+
loadbalancingClient, err := stackitclient.New(region, cfg.Global.ProjectID).LoadBalancing(lbOpts)
137142
if err != nil {
138143
return nil, fmt.Errorf("failed to create Load Balancing stackitclient: %v", err)
139144
}
@@ -146,7 +151,7 @@ func NewCloudControllerManager(cfg *stackitconfig.CCMConfig, obs *MetricsRemoteW
146151
iaasOpts = append(iaasOpts, sdkconfig.WithEndpoint(cfg.Global.APIEndpoints.IaasAPI))
147152
}
148153

149-
iaasClient, err := stackitclient.New(cfg.Global.Region, cfg.Global.ProjectID).IaaS(iaasOpts)
154+
iaasClient, err := stackitclient.New(region, cfg.Global.ProjectID).IaaS(iaasOpts)
150155
if err != nil {
151156
return nil, fmt.Errorf("failed to create IaaS stackitclient: %v", err)
152157
}

0 commit comments

Comments
 (0)