no token found in the application-manager SA secret for OCP V4.16 wit…

…h AWS provider (#399) Signed-off-by: Xiangjing Li <xiangli@redhat.com>
open-cluster-management-io · May 22, 2024 · 1fad32b · 1fad32b
1 parent 6c99bb5
commit 1fad32b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/pkg/controller/spoketoken/spoke_token_controller.go b/pkg/controller/spoketoken/spoke_token_controller.go
@@ -306,9 +306,11 @@ func (r *ReconcileAgentToken) getServiceAccountTokenSecret() string {
 			}
 
 			anno := dockerSecret.GetAnnotations()
-			klog.Info("found the application-manager-token secret " + anno["openshift.io/token-secret.name"])
 
-			return anno["openshift.io/token-secret.value"]
+			if anno["openshift.io/token-secret.value"] > "" {
+				klog.Info("found the application-manager-token secret " + anno["openshift.io/token-secret.name"])
+				return anno["openshift.io/token-secret.value"]
+			}
 		}
 	}
 

diff --git a/pkg/helmrelease/utils/helmrepoutils.go b/pkg/helmrelease/utils/helmrepoutils.go
@@ -192,7 +192,7 @@ func DownloadGitRepo(configMap *corev1.ConfigMap,
 			klog.Error(err, "- Failed to remove all: ", destRepo)
 		}
 
-		err = os.MkdirAll(destRepo, os.ModePerm)
+		err = os.MkdirAll(destRepo, os.ModePerm) // #nosec G301
 		if err != nil {
 			return "", err
 		}

diff --git a/pkg/utils/cert.go b/pkg/utils/cert.go
@@ -61,7 +61,7 @@ func GenerateServerCerts(dir string) error {
 	}
 
 	if _, err := os.Stat(dir); os.IsNotExist(err) {
-		err = os.MkdirAll(dir, os.ModePerm)
+		err = os.MkdirAll(dir, os.ModePerm) // #nosec G301
 		if err != nil {
 			klog.Error(err, "Failed to make directory ", dir)
 			return err

diff --git a/pkg/utils/gitrepo.go b/pkg/utils/gitrepo.go
@@ -193,7 +193,7 @@ func getConnectionOptions(cloneOptions *GitCloneOption, primary bool) (connectio
 		klog.Warning(err, "Failed to remove directory ", cloneOptions.DestDir)
 	}
 
-	err = os.MkdirAll(cloneOptions.DestDir, os.ModePerm)
+	err = os.MkdirAll(cloneOptions.DestDir, os.ModePerm) // #nosec G301
 
 	if err != nil {
 		return nil, err