Cancel refresh of StorageOS token (#67)

* Cancel refresh of StorageOS token

* Remove duplicated licence header

* Fix typo at CRD ServerURL

Author: mhmxs

api/v1alpha1/portalconfig_types.go

@@ -31,7 +31,7 @@ type IOTCoreConfig struct {
 	// Region is the GCP region, e.g. "europe-west1".
 	Region string `json:"region,omitempty"`
 
-	// SeverURL is the url of the iot server
+	// ServerURL is the url of the iot server
 	ServerURL string `json:"serverUrl,omitempty"`
 
 	// SignatureKey is the public part of message signature keys.

config/crd/bases/storageos.com_portalconfigs.yaml

@@ -90,7 +90,7 @@ spec:
                 description: Registry is the ID of the IOT Core Registry.
                 type: string
               serverUrl:
-                description: SeverURL is the url of the iot server
+                description: ServerURL is the url of the iot server
                 type: string
               signatureKey:
                 description: SignatureKey is the public part of message signature

controllers/config_controller.go

@@ -1,22 +1,6 @@
 /*
 Copyright 2022.
 
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Copyright 2022.
-
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at

endpoints/storageos.go

@@ -51,7 +51,7 @@ func (e *StorageOSEndpoint) UpdateLicence(key string) (*stosapiv2.Licence, error
 }
 
 // Start start endpoint service and token refresh.
-func (e *StorageOSEndpoint) Start() error {
+func (e *StorageOSEndpoint) Start(ctx context.Context) error {
 	e.logger.V(3).Info("Start storageos endpoint...")
 
 	var err error
@@ -67,14 +67,18 @@ func (e *StorageOSEndpoint) Start() error {
 
 	e.logger.V(3).Info("Storageos endpoint started", "ClusterID", e.clusterID)
 
-	// TODO would be nice to properly stop refresh.
 	go func() {
 		for {
-			if err := e.client.Refresh(context.Background(), time.Minute); err != nil {
+			if err := e.client.Refresh(ctx, time.Minute); err != nil {
 				e.logger.Error(err, "Failed to start refresh")
 			}
 
-			time.Sleep(time.Second)
+			select {
+			case <-ctx.Done():
+				return
+			default:
+				time.Sleep(time.Second)
+			}
 		}
 	}()
 

main.go

@@ -173,7 +173,7 @@ func main() {
 	stosService := fmt.Sprintf(stosServiceTemplate, currentNS)
 
 	stosEndpoint := endpoints.NewStorageOSEndpoint(stosUsername, stosPassword, stosService, logger)
-	err = stosEndpoint.Start()
+	err = stosEndpoint.Start(ctx)
 	if err != nil {
 		setupLogger.Error(err, "unable to start storageos endpoint")
 		panic(err)