[Addon] Update to Flux2 (fix conflicts)

addons/fluxcd/definitions/helm-release-def.cue

@@ -66,23 +66,36 @@ template: {
 	outputs: {
 		if parameter.sourceName == _|_ {
 			repo: {
-				apiVersion: "source.toolkit.fluxcd.io/v1beta2"
 				metadata: {
 					name: context.name
 				}
 				if parameter.repoType == "git" {
-					kind: "GitRepository"
+					apiVersion: "source.toolkit.fluxcd.io/v1"
+					kind:       "GitRepository"
 					spec: {
 						url: parameter.url
 						if parameter.git.branch != _|_ {
 							ref: branch: parameter.git.branch
 						}
+						if parameter.git.commit != _|_ {
+							ref: commit: parameter.git.commit
+						}
+						if parameter.git.name != _|_ {
+							ref: name: parameter.git.name
+						}
+						if parameter.git.semver != _|_ {
+							ref: semver: parameter.git.semver
+						}
+						if parameter.git.tag != _|_ {
+							ref: tag: parameter.git.tag
+						}
 						_secret
 						_sourceCommonArgs
 					}
 				}
 				if parameter.repoType == "oss" {
-					kind: "Bucket"
+					apiVersion: "source.toolkit.fluxcd.io/v1beta2"
+					kind:       "Bucket"
 					spec: {
 						endpoint:   parameter.url
 						bucketName: parameter.oss.bucketName
@@ -95,7 +108,8 @@ template: {
 					}
 				}
 				if parameter.repoType == "helm" || parameter.repoType == "oci" {
-					kind: "HelmRepository"
+					apiVersion: "source.toolkit.fluxcd.io/v1beta2"
+					kind:       "HelmRepository"
 					spec: {
 						url: parameter.url
 						if parameter.repoType == "oci" {
@@ -157,7 +171,7 @@ template: {
 				values: parameter.values
 			}
 			if parameter.valuesFrom != _|_ {
-				valuesFrom: [for v in parameter.valuesFrom {{
+				valuesFrom: [ for v in parameter.valuesFrom {{
 					kind: v.kind
 					name: v.name
 					if v.valuesKey != _|_ {
@@ -182,7 +196,7 @@ template: {
 				}
 				if parameter.upgradeCRD != _|_ {
 					if parameter.upgradeCRD {
-						 crds: "CreateReplace"
+						crds: "CreateReplace"
 					}
 				}
 			}
@@ -224,8 +238,16 @@ template: {
 		sourceName?: string
 
 		git?: {
-			// +usage=The Git reference to checkout and monitor for changes, defaults to main branch
-			branch: *"main" | string
+			// +usage=The Git branch to checkout and monitor for changes, defaults to main branch
+			branch?: *"main" | string
+			// +usage=The Git commit to checkout and monitor for changes, takes precedence over all reference fields
+			commit?: string
+			// +usage=The Git reference name to checkout and monitor for changes, takes precendence over branch, tag and semver
+			name?: string
+			// +usage=Semver tag expression to checkout and monitor for changes, takes precedence over tag
+			semver?: string
+			// +usage=The Git tag to checkout and monitor for changes, takes precedence over branch
+			tag?: string
 		}
 		oss?: {
 			// +usage=The bucket's name, required if repoType is oss
@@ -235,10 +257,9 @@ template: {
 			// +usage=The bucket region, optional
 			region?: string
 		}
-		helmrepository?: {		   
+		helmrepository?: {
 			// +usage=The OIDC provider used for authentication purposes.The generic provider can be used for public repositories or when static credentials are used for authentication, either with spec.secretRef or spec.serviceAccountName
-			provider: *"generic" | "azure" | "aws" | "gcp"		
-
+			provider: *"generic" | "azure" | "aws" | "gcp"
 		}
 		// +usage=Alternative list of values files to use as the chart values (values.yaml is not included by default), expected to be a relative path in the SourceRef.Values files are merged in the order of this list with the last file overriding the first.
 		valuesFiles?: [...string]

addons/fluxcd/definitions/kustomize.cue

@@ -9,7 +9,7 @@ kustomize: {
 
 template: {
 	output: {
-		apiVersion: "kustomize.toolkit.fluxcd.io/v1beta2"
+		apiVersion: "kustomize.toolkit.fluxcd.io/v1"
 		kind:       "Kustomization"
 		metadata: {
 			name:      context.name
@@ -56,32 +56,37 @@ template: {
 	outputs: {
 		if parameter.sourceName == _|_ {
 			repo: {
-				apiVersion: "source.toolkit.fluxcd.io/v1beta2"
 				metadata: {
 					name:      context.name
 					namespace: context.namespace
 				}
 				if parameter.repoType == "git" {
-					kind: "GitRepository"
+					apiVersion: "source.toolkit.fluxcd.io/v1"
+					kind:       "GitRepository"
 					spec: {
 						url: parameter.url
 						if parameter.git.branch != _|_ {
 							ref: branch: parameter.git.branch
 						}
-						if parameter.git.provider != _|_ {
-							if parameter.git.provider == "GitHub" {
-								gitImplementation: "go-git"
-							}
-							if parameter.git.provider == "AzureDevOps" {
-								gitImplementation: "libgit2"
-							}
+						if parameter.git.commit != _|_ {
+							ref: commit: parameter.git.commit
+						}
+						if parameter.git.name != _|_ {
+							ref: name: parameter.git.name
+						}
+						if parameter.git.semver != _|_ {
+							ref: semver: parameter.git.semver
+						}
+						if parameter.git.tag != _|_ {
+							ref: tag: parameter.git.tag
 						}
 						_secret
 						_sourceCommonArgs
 					}
 				}
 				if parameter.repoType == "oss" {
-					kind: "Bucket"
+					apiVersion: "source.toolkit.fluxcd.io/v1beta2"
+					kind:       "Bucket"
 					spec: {
 						endpoint:   parameter.url
 						bucketName: parameter.oss.bucketName
@@ -94,15 +99,22 @@ template: {
 					}
 				}
 				if parameter.repoType == "oci" {
-					kind: "OCIRepository"
+					apiVersion: "source.toolkit.fluxcd.io/v1beta2"
+					kind:       "OCIRepository"
 					spec: {
 						url: parameter.url
 						if parameter.oci.provider != _|_ {
 							provider: parameter.oci.provider
 						}
 						if parameter.oci.tag != _|_ {
 							ref: tag: parameter.oci.tag
-						}						
+						}
+						if parameter.oci.semver != _|_ {
+							ref: semver: parameter.oci.semver
+						}
+						if parameter.oci.digest != _|_ {
+							ref: digest: parameter.oci.digest
+						}
 						_secret
 						_sourceCommonArgs
 					}
@@ -112,7 +124,7 @@ template: {
 
 		if parameter.imageRepository != _|_ {
 			imageRepo: {
-				apiVersion: "image.toolkit.fluxcd.io/v1beta1"
+				apiVersion: "image.toolkit.fluxcd.io/v1beta2"
 				kind:       "ImageRepository"
 				metadata: {
 					name:      context.name
@@ -128,7 +140,7 @@ template: {
 			}
 
 			imagePolicy: {
-				apiVersion: "image.toolkit.fluxcd.io/v1beta1"
+				apiVersion: "image.toolkit.fluxcd.io/v1beta2"
 				kind:       "ImagePolicy"
 				metadata: {
 					name:      context.name
@@ -260,10 +272,16 @@ template: {
 			}
 		}
 		git?: {
-			// +usage=The Git reference to checkout and monitor for changes, defaults to master branch
-			branch: string
-			// +usage=Determines which git client library to use. Defaults to GitHub, it will pick go-git. AzureDevOps will pick libgit2.
-			provider?: *"GitHub" | "AzureDevOps"
+			// +usage=The Git branch to checkout and monitor for changes, defaults to main branch
+			branch?: *"main" | string
+			// +usage=The Git commit to checkout and monitor for changes, takes precedence over all reference fields
+			commit?: string
+			// +usage=The Git reference name to checkout and monitor for changes, takes precendence over branch, tag and semver
+			name?: string
+			// +usage=Semver tag expression to checkout and monitor for changes, takes precedence over tag
+			semver?: string
+			// +usage=The Git tag to checkout and monitor for changes, takes precedence over branch
+			tag?: string
 		}
 		oss?: {
 			// +usage=The bucket's name, required if repoType is oss
@@ -273,12 +291,15 @@ template: {
 			// +usage=The bucket region, optional
 			region?: string
 		}
-		oci?: {		   
+		oci?: {
 			// +usage=The OIDC provider used for authentication purposes.The generic provider can be used for public repositories or when static credentials are used for authentication, either with spec.secretRef or spec.serviceAccountName
 			provider: *"generic" | "azure" | "aws" | "gcp"
 			// +usage=The image tag
-			tag: *"latest" | string
-
+			tag?: string
+			// +usage=The image digest, takes precedence over all fields.
+			digest?: string
+			// +usage=Semver tag expression to checkout and monitor for changes, takes precedence over tag
+			semver?: string
 		}
 		//+usage=Path to the directory containing the kustomization.yaml file, or the set of plain YAMLs a kustomization.yaml should be generated for.
 		path: string

addons/fluxcd/metadata.yaml

@@ -1,5 +1,5 @@
 name: fluxcd
-version: 2.4.0
+version: 3.0.0
 description: Extended workload to do continuous and progressive delivery
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/flux/horizontal/color/flux-horizontal-color.png
 url: https://fluxcd.io

addons/fluxcd/resources/components/helm-controller.cue

@@ -12,7 +12,7 @@ helmController: {
 	dependsOn: ["fluxcd-ns"]
 	properties: {
 		imagePullPolicy: "IfNotPresent"
-		image:           _base + "fluxcd/helm-controller:v0.28.1"
+		image:           _base + "fluxcd/helm-controller:v0.36.0"
 		env: [
 			{
 				name:  "RUNTIME_NAMESPACE"

addons/fluxcd/resources/components/image-automation-controller.cue

@@ -12,7 +12,7 @@ imageAutomationController: {
 	dependsOn: ["fluxcd-ns"]
 	properties: {
 		imagePullPolicy: "IfNotPresent"
-		image:           _base + "fluxcd/image-automation-controller:v0.28.0"
+		image:           _base + "fluxcd/image-automation-controller:v0.36.0"
 		env: [
 			{
 				name:  "RUNTIME_NAMESPACE"

addons/fluxcd/resources/components/image-reflector-controller.cue

@@ -12,7 +12,7 @@ imageReflectorController: {
 	dependsOn: ["fluxcd-ns"]
 	properties: {
 		imagePullPolicy: "IfNotPresent"
-		image:           _base + "fluxcd/image-reflector-controller:v0.23.1"
+		image:           _base + "fluxcd/image-reflector-controller:v0.30.0"
 		env: [
 			{
 				name:  "RUNTIME_NAMESPACE"

addons/fluxcd/resources/components/kustomize-controller.cue

@@ -12,7 +12,7 @@ kustomizeController: {
 	dependsOn: ["fluxcd-ns"]
 	properties: {
 		imagePullPolicy: "IfNotPresent"
-		image:           _base + "fluxcd/kustomize-controller:v0.32.0"
+		image:           _base + "fluxcd/kustomize-controller:v1.1.0"
 		env: [
 			{
 				name:  "RUNTIME_NAMESPACE"

addons/fluxcd/resources/components/source-controller.cue

@@ -18,7 +18,7 @@ sourceController: {
 	dependsOn: ["fluxcd-ns"]
 	properties: {
 		imagePullPolicy: "IfNotPresent"
-		image:           _base + "fluxcd/source-controller:v0.33.0"
+		image:           _base + "fluxcd/source-controller:v1.1.0"
 		env: [
 			{
 				name:  "RUNTIME_NAMESPACE"

addons/fluxcd/resources/crds/bucket.cue

@@ -4,18 +4,16 @@ bucketCRD: {
 	apiVersion: "apiextensions.k8s.io/v1"
 	kind:       "CustomResourceDefinition"
 	metadata: {
-		annotations: "controller-gen.kubebuilder.io/version": "v0.8.0"
+		annotations: "controller-gen.kubebuilder.io/version": "v0.12.0"
 		labels: {
-			"app.kubernetes.io/component":           "source-controller"
-			"app.kubernetes.io/instance":            "flux-system"
-			"app.kubernetes.io/part-of":             "flux"			
-			"kustomize.toolkit.fluxcd.io/name":      "flux-system"
-			"kustomize.toolkit.fluxcd.io/namespace": "flux-system"
+			"app.kubernetes.io/component": "source-controller"
+			"app.kubernetes.io/instance":  "flux-system"
+			"app.kubernetes.io/part-of":   "flux"
+			"app.kubernetes.io/version":   "v2.1.0"
 		}
 		name: "buckets.source.toolkit.fluxcd.io"
 	}
 	spec: {
-		conversion: strategy: "None"
 		group: "source.toolkit.fluxcd.io"
 		names: {
 			kind:     "Bucket"
@@ -192,10 +190,10 @@ bucketCRD: {
 								description: "Conditions holds the conditions for the Bucket."
 								items: {
 									description: """
-		Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, 
-		 type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` 
-		 // other fields }
-		"""
+			Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, 
+			 type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` 
+			 // other fields }
+			"""
 
 									properties: {
 										lastTransitionTime: {
@@ -357,9 +355,10 @@ bucketCRD: {
 								type:        "boolean"
 							}
 							interval: {
-								description: "Interval at which to check the Endpoint for updates."
-								pattern:     "^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$"
-								type:        "string"
+								description: "Interval at which the Bucket Endpoint is checked for updates. This interval is approximate and may be subject to jitter to ensure efficient use of resources."
+
+								pattern: "^([0-9]+(\\.[0-9]+)?(ms|s|m|h))+$"
+								type:    "string"
 							}
 							provider: {
 								default:     "generic"
@@ -416,8 +415,9 @@ bucketCRD: {
 							artifact: {
 								description: "Artifact represents the last successful Bucket reconciliation."
 								properties: {
-									checksum: {
-										description: "Checksum is the SHA256 checksum of the Artifact file."
+									digest: {
+										description: "Digest is the digest of the file in the form of '<algorithm>:<checksum>'."
+										pattern:     "^[a-z0-9]+(?:[.+_-][a-z0-9]+)*:[a-zA-Z0-9=_-]+$"
 										type:        "string"
 									}
 									lastUpdateTime: {
@@ -453,7 +453,9 @@ bucketCRD: {
 									}
 								}
 								required: [
+									"lastUpdateTime",
 									"path",
+									"revision",
 									"url",
 								]
 								type: "object"
@@ -462,10 +464,10 @@ bucketCRD: {
 								description: "Conditions holds the conditions for the Bucket."
 								items: {
 									description: """
-		Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, 
-		 type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` 
-		 // other fields }
-		"""
+			Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions.  For example, 
+			 type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` 
+			 // other fields }
+			"""
 
 									properties: {
 										lastTransitionTime: {