feat: Upgrade flux to 2.0.1

mesosphere · Aug 9, 2023 · 7662433 · 7662433
1 parent bec2185
commit 7662433
Show file tree

Hide file tree

Showing 39 changed files with 1,281 additions and 97 deletions.
diff --git a/.tool-versions b/.tool-versions
@@ -1,5 +1,5 @@
 awscli 2.9.0
-flux2 0.41.2
+flux2 2.0.1
 github-cli 2.20.2
 golang 1.19.3
 kustomize 4.5.7

diff --git a/...es/kommander-flux/0.41.2/defaults/cm.yaml → ...ces/kommander-flux/2.0.1/defaults/cm.yaml b/...es/kommander-flux/0.41.2/defaults/cm.yaml → ...ces/kommander-flux/2.0.1/defaults/cm.yaml
@@ -4,5 +4,5 @@ data:
     ---
 kind: ConfigMap
 metadata:
-  name: kommander-flux-0.41.2-d2iq-defaults
+  name: kommander-flux-2.0.1-d2iq-defaults
   namespace: ${releaseNamespace}
diff --git a/...r-flux/0.41.2/defaults/kustomization.yaml → ...er-flux/2.0.1/defaults/kustomization.yaml b/...r-flux/0.41.2/defaults/kustomization.yaml → ...er-flux/2.0.1/defaults/kustomization.yaml
diff --git a/.../kommander-flux/0.41.2/kustomization.yaml → ...s/kommander-flux/2.0.1/kustomization.yaml b/.../kommander-flux/0.41.2/kustomization.yaml → ...s/kommander-flux/2.0.1/kustomization.yaml
diff --git a/...der-flux/0.41.2/patch-proxy-env-vars.yaml → ...nder-flux/2.0.1/patch-proxy-env-vars.yaml b/...der-flux/0.41.2/patch-proxy-env-vars.yaml → ...nder-flux/2.0.1/patch-proxy-env-vars.yaml
diff --git a/...1.2/patch-source-ctrl-network-policy.yaml → ...0.1/patch-source-ctrl-network-policy.yaml b/...1.2/patch-source-ctrl-network-policy.yaml → ...0.1/patch-source-ctrl-network-policy.yaml
diff --git a/...lerts.notification.toolkit.fluxcd.io.yaml → ...lerts.notification.toolkit.fluxcd.io.yaml b/...lerts.notification.toolkit.fluxcd.io.yaml → ...lerts.notification.toolkit.fluxcd.io.yaml
@@ -2,13 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   labels:
     app.kubernetes.io/component: notification-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.41.2
+    app.kubernetes.io/version: v2.0.1
   name: alerts.notification.toolkit.fluxcd.io
 spec:
   group: notification.toolkit.fluxcd.io
@@ -244,6 +243,16 @@ spec:
             description: AlertSpec defines an alerting rule for events involving a
               list of objects.
             properties:
+              eventMetadata:
+                additionalProperties:
+                  type: string
+                description: EventMetadata is an optional field for adding metadata
+                  to events dispatched by the controller. This can be used for enhancing
+                  the context of the event. If a field would override one already
+                  present on the original event as generated by the emitter, then
+                  the override doesn't happen, i.e. the original value is preserved,
+                  and an info log is printed.
+                type: object
               eventSeverity:
                 default: info
                 description: EventSeverity specifies how to filter events based on
@@ -260,10 +269,10 @@ spec:
                     to let you locate the typed referenced object at cluster level
                   properties:
                     apiVersion:
-                      description: API version of the referent.
+                      description: API version of the referent
                       type: string
                     kind:
-                      description: Kind of the referent.
+                      description: Kind of the referent
                       enum:
                       - Bucket
                       - GitRepository
@@ -283,19 +292,21 @@ spec:
                         {key,value} in the matchLabels map is equivalent to an element
                         of matchExpressions, whose key field is "key", the operator
                         is "In", and the values array contains only "value". The requirements
-                        are ANDed.
+                        are ANDed. MatchLabels requires the name to be set to `*`.
                       type: object
                     name:
-                      description: Name of the referent.
+                      description: Name of the referent If multiple resources are
+                        targeted `*` may be set.
                       maxLength: 53
                       minLength: 1
                       type: string
                     namespace:
-                      description: Namespace of the referent.
+                      description: Namespace of the referent
                       maxLength: 53
                       minLength: 1
                       type: string
                   required:
+                  - kind
                   - name
                   type: object
                 type: array
@@ -305,6 +316,12 @@ spec:
                 items:
                   type: string
                 type: array
+              inclusionList:
+                description: InclusionList specifies a list of Golang regular expressions
+                  to be used for including messages.
+                items:
+                  type: string
+                type: array
               providerRef:
                 description: ProviderRef specifies which Provider this Alert should
                   use.

diff --git a/...ion_buckets.source.toolkit.fluxcd.io.yaml → ...ion_buckets.source.toolkit.fluxcd.io.yaml b/...ion_buckets.source.toolkit.fluxcd.io.yaml → ...ion_buckets.source.toolkit.fluxcd.io.yaml
@@ -2,13 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.11.1
-  creationTimestamp: null
+    controller-gen.kubebuilder.io/version: v0.12.0
   labels:
     app.kubernetes.io/component: source-controller
     app.kubernetes.io/instance: kommander-flux
     app.kubernetes.io/part-of: flux
-    app.kubernetes.io/version: v0.41.2
+    app.kubernetes.io/version: v2.0.1
   name: buckets.source.toolkit.fluxcd.io
 spec:
   group: source.toolkit.fluxcd.io
@@ -380,10 +379,6 @@ spec:
               artifact:
                 description: Artifact represents the last successful Bucket reconciliation.
                 properties:
-                  checksum:
-                    description: 'Checksum is the SHA256 checksum of the Artifact
-                      file. Deprecated: use Artifact.Digest instead.'
-                    type: string
                   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=_-]+$
@@ -419,7 +414,9 @@ spec:
                       the Artifact contents.
                     type: string
                 required:
+                - lastUpdateTime
                 - path
+                - revision
                 - url
                 type: object
               conditions: