Merge pull request #6638 from sbueringer/pr-runtimesdk-fixups

🐛 RuntimeSDK: some bugfixes

Author: k8s-ci-robot

config/rbac/role.yaml

@@ -5,6 +5,14 @@ metadata:
   creationTimestamp: null
   name: manager-role
 rules:
+- apiGroups:
+  - ""
+  resources:
+  - namespaces
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - addons.cluster.x-k8s.io
   resources:

exp/runtime/internal/controllers/extensionconfig_controller.go

@@ -36,6 +36,7 @@ import (
 )
 
 // +kubebuilder:rbac:groups=runtime.cluster.x-k8s.io,resources=extensionconfigs;extensionconfigs/status,verbs=get;list;watch;patch;update
+// +kubebuilder:rbac:groups="",resources=namespaces,verbs=get;list;watch
 
 // Reconciler reconciles an ExtensionConfig object.
 type Reconciler struct {

main.go

@@ -377,6 +377,7 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager) {
 			RuntimeClient: runtimeclient.New(runtimeclient.Options{
 				Catalog:  catalog,
 				Registry: registry,
+				Client:   mgr.GetClient(),
 			}),
 			WatchFilterValue: watchFilterValue,
 		}).SetupWithManager(ctx, mgr, concurrency(extensionConfigConcurrency)); err != nil {

test/e2e/cluster_upgrade_runtimesdk.go

@@ -227,8 +227,12 @@ func extensionConfig(specName string, namespace *corev1.Namespace) *runtimev1.Ex
 				},
 			},
 			NamespaceSelector: &metav1.LabelSelector{
-				MatchLabels: map[string]string{
-					"kubernetes.io/metadata.name:": namespace.Name,
+				MatchExpressions: []metav1.LabelSelectorRequirement{
+					{
+						Key:      "kubernetes.io/metadata.name",
+						Operator: metav1.LabelSelectorOpIn,
+						Values:   []string{namespace.Name},
+					},
 				},
 			},
 		},