Merge pull request #97 from MikeSpreitzer/migrate-and-bump

✨ Bump kube from 1.29 to 1.30

Author: pdettori

chart/templates/operator.yaml

@@ -241,8 +241,8 @@ spec:
             - --agent-vmodule={{.Values.agent.vmodule}}
           env:
             - name: STATUS_ADDDON_IMAGE_NAME
-              value: ko.local/ocm-status-addon:39e5223
-          image: ko.local/ocm-status-addon:39e5223
+              value: ko.local/ocm-status-addon:38156c6
+          image: ko.local/ocm-status-addon:38156c6
           imagePullPolicy: IfNotPresent
           name: status-controller
           ports:
@@ -280,10 +280,17 @@ spec:
               metadata:
                 name: addon-status
                 namespace: open-cluster-management
+                annotations:
+                  addon.open-cluster-management.io/lifecycle: addon-manager
               spec:
                 addOnMeta:
                   description: status addon provides full status on applied resources
                   displayName: addon-status
+                installStrategy:
+                  type: Placements
+                  placements:
+                  - name: global
+                    namespace: {{ .Release.Namespace }}
                 supportedConfigs:
                 - group: addon.open-cluster-management.io
                   resource: addondeploymentconfigs
@@ -296,3 +303,23 @@ spec:
       securityContext:
         runAsNonRoot: true
       serviceAccountName: addon-status-sa
+---
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
+metadata:
+  name: global
+  namespace: open-cluster-management
+spec:
+  clusterSets:
+    - global
+  predicates:
+    - requiredClusterSelector:
+        labelSelector: {}
+---
+apiVersion: cluster.open-cluster-management.io/v1beta2
+kind: ManagedClusterSetBinding
+metadata:
+  name: global
+  namespace: open-cluster-management
+spec:
+  clusterSet: global

cmd/ocm-status-addon/main.go

@@ -19,7 +19,6 @@ import (
 
 	"open-cluster-management.io/addon-framework/pkg/addonfactory"
 	"open-cluster-management.io/addon-framework/pkg/addonmanager"
-	addonagent "open-cluster-management.io/addon-framework/pkg/agent"
 	cmdfactory "open-cluster-management.io/addon-framework/pkg/cmd/factory"
 	"open-cluster-management.io/addon-framework/pkg/utils"
 	"open-cluster-management.io/addon-framework/pkg/version"
@@ -169,7 +168,10 @@ func (ac *agentController) runController(ctx context.Context, kubeConfig *rest.C
 			),
 		).
 		WithAgentRegistrationOption(registrationOption).
-		WithInstallStrategy(addonagent.InstallAllStrategy(controller.InstallationNamespace)).
+		WithAgentInstallNamespace(func(*addonapiv1alpha1.ManagedClusterAddOn) (string, error) {
+			return controller.InstallationNamespace, nil
+		}).
+		// WithInstallStrategy(addonagent.InstallAllStrategy(controller.InstallationNamespace)).
 		WithAgentHealthProber(controller.AgentHealthProber()).
 		BuildTemplateAgentAddon()
 	if err != nil {

config/default/kustomization.yaml

@@ -1,13 +1,6 @@
 # Adds namespace to all resources.
 namespace: open-cluster-management
 
-# Value of this field is prepended to the
-# names of all resources, e.g. a deployment named
-# "wordpress" becomes "alices-wordpress".
-# Note that it should also match with the prefix (text before '-') of the namespace
-# field above.
-namePrefix: addon-
-
 # Labels to add to all resources and selectors.
 #labels:
 #- includeSelectors: true

config/manager/kustomization.yaml

@@ -1,4 +1,6 @@
 resources:
+- managedclustersetbinding.yaml
+- placement.yaml
 - manager.yaml
 
 apiVersion: kustomize.config.k8s.io/v1beta1
@@ -13,13 +15,13 @@ replacements:
     fieldPath: spec.template.spec.containers.[name=status-controller].image
     group: apps
     kind: Deployment
-    name: status-controller
+    name: addon-status-controller
     version: v1
   targets:
   - fieldPaths:
     - spec.template.spec.containers.0.env.0.value
     select:
       group: apps
       kind: Deployment
-      name: status-controller
+      name: addon-status-controller
       version: v1

config/manager/managedclustersetbinding.yaml

@@ -0,0 +1,6 @@
+apiVersion: cluster.open-cluster-management.io/v1beta2
+kind: ManagedClusterSetBinding
+metadata:
+  name: global
+spec:
+  clusterSet: global

config/manager/manager.yaml

@@ -1,7 +1,7 @@
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: status-controller
+  name: addon-status-controller
   labels:
     control-plane: controller-manager
     app.kubernetes.io/name: deployment
@@ -50,10 +50,17 @@ spec:
           metadata:
             name: addon-status
             namespace: open-cluster-management
+            annotations:
+              addon.open-cluster-management.io/lifecycle: addon-manager
           spec:
             addOnMeta:
               description: status addon provides full status on applied resources
               displayName: addon-status
+            installStrategy:
+              type: Placements
+              placements:
+              - name: global
+                namespace: {{ .Release.Namespace }}
             supportedConfigs:
             - group: addon.open-cluster-management.io
               resource: addondeploymentconfigs

config/manager/placement.yaml

@@ -0,0 +1,10 @@
+apiVersion: cluster.open-cluster-management.io/v1beta1
+kind: Placement
+metadata:
+  name: global
+spec:
+  clusterSets:
+    - global
+  predicates:
+    - requiredClusterSelector:
+        labelSelector: {}

config/rbac/kustomization.yaml

@@ -5,4 +5,9 @@ resources:
 - role.yaml
 - role_binding.yaml
 
-
+# Value of this field is prepended to the
+# names of all resources, e.g. a deployment named
+# "wordpress" becomes "alices-wordpress".
+# Note that it should also match with the prefix (text before '-') of the namespace
+# field above.
+namePrefix: addon-

go.mod

@@ -5,19 +5,19 @@ go 1.23.0
 toolchain go1.24.1
 
 require (
-	github.com/go-logr/logr v1.4.1
+	github.com/go-logr/logr v1.4.2
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
-	golang.org/x/time v0.3.0
-	k8s.io/api v0.29.10
-	k8s.io/apimachinery v0.29.10
-	k8s.io/apiserver v0.29.2
-	k8s.io/client-go v0.29.10
-	k8s.io/component-base v0.29.10
+	golang.org/x/time v0.5.0
+	k8s.io/api v0.30.12
+	k8s.io/apimachinery v0.30.12
+	k8s.io/apiserver v0.30.12
+	k8s.io/client-go v0.30.12
+	k8s.io/component-base v0.30.12
 	k8s.io/klog/v2 v2.120.1
-	open-cluster-management.io/addon-framework v0.9.3
-	open-cluster-management.io/api v0.13.0
-	sigs.k8s.io/controller-runtime v0.17.6
+	open-cluster-management.io/addon-framework v0.11.0
+	open-cluster-management.io/api v0.15.0
+	sigs.k8s.io/controller-runtime v0.18.7
 
 )
 
@@ -39,9 +39,9 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.7.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.8.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/fatih/structs v1.1.0 // indirect
-	github.com/felixge/httpsnoop v1.0.3 // indirect
+	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-logr/zapr v1.3.0 // indirect
@@ -52,15 +52,15 @@ require (
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
-	github.com/google/cel-go v0.17.7 // indirect
+	github.com/google/cel-go v0.17.8 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
 	github.com/huandu/xstrings v1.4.0 // indirect
-	github.com/imdario/mergo v0.3.13 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -86,42 +86,41 @@ require (
 	go.etcd.io/etcd/client/pkg/v3 v3.5.10 // indirect
 	go.etcd.io/etcd/client/v3 v3.5.10 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
-	go.opentelemetry.io/otel v1.19.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
+	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
-	go.opentelemetry.io/otel/metric v1.19.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.19.0 // indirect
-	go.opentelemetry.io/otel/trace v1.19.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.22.0 // indirect
+	go.opentelemetry.io/otel/trace v1.24.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.26.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
 	golang.org/x/crypto v0.35.0 // indirect
-	golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
+	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df // indirect
 	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/oauth2 v0.16.0 // indirect
+	golang.org/x/oauth2 v0.17.0 // indirect
 	golang.org/x/sync v0.11.0 // indirect
 	golang.org/x/sys v0.30.0 // indirect
 	golang.org/x/term v0.29.0 // indirect
 	golang.org/x/text v0.22.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
-	google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 // indirect
-	google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240311132316-a219d84964c2 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
 	google.golang.org/grpc v1.62.1 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	helm.sh/helm/v3 v3.14.4 // indirect
-	k8s.io/apiextensions-apiserver v0.29.2 // indirect
-	k8s.io/kms v0.29.2 // indirect
-	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
+	k8s.io/apiextensions-apiserver v0.30.2 // indirect
+	k8s.io/kms v0.30.12 // indirect
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
 	k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect
-	open-cluster-management.io/sdk-go v0.13.1-0.20240416030555-aa744f426379 // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
+	open-cluster-management.io/sdk-go v0.15.0 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.4 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect