Merge branch 'open-cluster-management-io:main' into chore/fix-typo

Author: ahmad-ibra

fleetconfig-controller/api/v1beta1/constants.go

@@ -162,6 +162,13 @@ const (
 	LabelAddOnManagedBy = "addon.open-cluster-management.io/managedBy"
 )
 
+// FleetConfig addon annotations
+const (
+	// AnnotationAddOnDeploymentConfigHash is the annotation key for storing the hash of an addon's deployment configuration.
+	// Used to detect when the configuration changes and trigger a redeploy.
+	AnnotationAddOnDeploymentConfigHash = "fleetconfig.open-cluster-management.io/configHash"
+)
+
 // Registration driver types
 const (
 	// CSRRegistrationDriver is the default CSR-based registration driver.

fleetconfig-controller/api/v1beta1/spoke_types.go

@@ -23,6 +23,7 @@ import (
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	addonv1alpha1 "open-cluster-management.io/api/addon/v1alpha1"
 	"open-cluster-management.io/ocm/pkg/operator/helpers/chart"
 )
 
@@ -279,13 +280,14 @@ type AddOn struct {
 	// +required
 	ConfigName string `json:"configName"`
 
-	// The namespace to install the add-on in. If left empty, installs into the "open-cluster-management-addon" namespace.
-	// +optional
-	InstallNamespace string `json:"installNamespace,omitempty"`
-
 	// Annotations to apply to the add-on.
 	// +optional
 	Annotations map[string]string `json:"annotations,omitempty"`
+
+	// DeploymentConfig provides additional configuration for the add-on deployment.
+	// If specified, this will be used to create an AddOnDeploymentConfig resource.
+	// +optional
+	DeploymentConfig *addonv1alpha1.AddOnDeploymentConfigSpec `json:"deploymentConfig,omitempty"`
 }
 
 // SpokeStatus defines the observed state of Spoke.

fleetconfig-controller/api/v1beta1/zz_generated.deepcopy.go

@@ -38,7 +38,7 @@ ARG ARCH
 RUN apk update && apk add --no-cache bash curl
 
 # Install clusteradm
-ARG CLUSTERADM_VERSION=1.0.2
+ARG CLUSTERADM_VERSION=1.1.0
 RUN curl -L https://raw.githubusercontent.com/open-cluster-management-io/clusteradm/main/install.sh | bash -s -- ${CLUSTERADM_VERSION}
 
 ## Stage 3: Compress binaries with upx to reduce image size

fleetconfig-controller/build/Dockerfile.base

@@ -16,7 +16,7 @@ RUN apk add --no-cache bash curl python3 py3-pip
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 
 # Install clusteradm
-ARG CLUSTERADM_VERSION=1.0.2
+ARG CLUSTERADM_VERSION=1.1.0
 RUN curl -L https://raw.githubusercontent.com/open-cluster-management-io/clusteradm/main/install.sh | bash -s -- ${CLUSTERADM_VERSION}
 
 # Install aws-iam-authenticator if building for EKS

fleetconfig-controller/build/Dockerfile.devspace

@@ -38,7 +38,7 @@ ARG ARCH
 RUN apk update && apk add --no-cache bash curl
 
 # Install clusteradm
-ARG CLUSTERADM_VERSION=1.0.2
+ARG CLUSTERADM_VERSION=1.1.0
 RUN curl -L https://raw.githubusercontent.com/open-cluster-management-io/clusteradm/main/install.sh | bash -s -- ${CLUSTERADM_VERSION}
 
 # Install aws-iam-authenticator

fleetconfig-controller/build/Dockerfile.eks

@@ -37,7 +37,7 @@ ARG ARCH
 RUN apk update && apk add --no-cache bash curl
 
 # Install clusteradm
-ARG CLUSTERADM_VERSION=1.0.2
+ARG CLUSTERADM_VERSION=1.1.0
 RUN curl -L https://raw.githubusercontent.com/open-cluster-management-io/clusteradm/main/install.sh | bash -s -- ${CLUSTERADM_VERSION}
 
 ## Stage 3: Compress binaries with upx to reduce image size

fleetconfig-controller/build/Dockerfile.gke

@@ -158,7 +158,7 @@ Resource specifications for all klusterlet-managed containers.
 | `replicas`                                          | fleetconfig-controller replica count                                                                                                                                       | `1`                                                      |
 | `imageRegistry`                                     | Image registry                                                                                                                                                             | `""`                                                     |
 | `image.repository`                                  | Image repository                                                                                                                                                           | `quay.io/open-cluster-management/fleetconfig-controller` |
-| `image.tag`                                         | Image tag                                                                                                                                                                  | `v0.1.6`                                                 |
+| `image.tag`                                         | Image tag                                                                                                                                                                  | `v0.1.7`                                                 |
 | `image.pullPolicy`                                  | Image pull policy                                                                                                                                                          | `IfNotPresent`                                           |
 | `imagePullSecrets`                                  | Image pull secrets                                                                                                                                                         | `[]`                                                     |
 | `serviceAccount.annotations`                        | Annotations to add to the service account                                                                                                                                  | `{}`                                                     |