Adding permissions for controller packages helm upgrade (#8012)

aws · Apr 22, 2024 · 7ed6a68 · 7ed6a68
1 parent cea3c2f
commit 7ed6a68
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/config/manifest/eksa-components.yaml b/config/manifest/eksa-components.yaml
@@ -7134,6 +7134,7 @@ rules:
   - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:

diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml
@@ -54,6 +54,7 @@ rules:
   - delete
   - get
   - list
+  - patch
   - update
   - watch
 - apiGroups:

diff --git a/controllers/cluster_controller.go b/controllers/cluster_controller.go
@@ -171,7 +171,7 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager, log logr.Logger)
 }
 
 // +kubebuilder:rbac:groups="",resources=events,verbs=create;patch;update
-// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;delete;update
+// +kubebuilder:rbac:groups="",resources=secrets,verbs=get;list;watch;create;delete;update;patch
 // +kubebuilder:rbac:groups="",namespace=eksa-system,resources=secrets,verbs=patch;update
 // +kubebuilder:rbac:groups="",resources=namespaces,verbs=create;delete
 // +kubebuilder:rbac:groups="",resources=nodes,verbs=list

diff --git a/pkg/curatedpackages/packagecontrollerclient.go b/pkg/curatedpackages/packagecontrollerclient.go
@@ -308,9 +308,11 @@ func (pc *PackageControllerClient) generateHelmOverrideValues() ([]byte, error)
 	endpoint, username, password, caCertContent, insecureSkipVerify := "", "", "", "", "false"
 	if pc.registryMirror != nil {
 		endpoint = pc.registryMirror.BaseRegistry
-		username, password, err = config.ReadCredentials()
-		if err != nil {
-			return []byte{}, err
+		if pc.registryMirror.Auth {
+			username, password, err = config.ReadCredentials()
+			if err != nil {
+				return []byte{}, err
+			}
 		}
 		caCertContent = pc.registryMirror.CACertContent
 		if pc.registryMirror.InsecureSkipVerify {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7134,6 +7134,7 @@ rules: @@
       - delete
       - get
       - list
+      - patch
       - update
       - watch
     - apiGroups:
@@ Expand Down @@