Skip to content

Commit

Permalink
feat: Upgrade flux to 2.4.0 (#2777)
Browse files Browse the repository at this point in the history
* fix: flux update gha

* feat: Upgrade flux to 2.4.0

* build: Updated licenses.d2iq.yaml

---------

Co-authored-by: d2iq-mergebot <[email protected]>
  • Loading branch information
cwyl02 and d2iq-mergebot authored Oct 28, 2024
1 parent 3acd054 commit d1f4f05
Show file tree
Hide file tree
Showing 41 changed files with 872 additions and 748 deletions.
470 changes: 235 additions & 235 deletions devbox.lock

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions hack/flux/update-flux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ function update_flux() {
echo "updating flux to ${local_flux_version}"
else
echo "flux ${LATEST_FLUX_VERSION} not available in devbox, the latest available is ${local_flux_version}"
echo "running devbox update"
devbox update
fi

mkdir -p "$REPO_ROOT/services/kommander-flux/$LATEST_FLUX_VERSION"
Expand Down
8 changes: 4 additions & 4 deletions licenses.d2iq.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -303,22 +303,22 @@ resources:
- license_path: LICENSE
ref: ${image_tag}
url: https://github.com/brancz/kube-rbac-proxy
- container_image: ghcr.io/fluxcd/helm-controller:v1.0.1
- container_image: ghcr.io/fluxcd/helm-controller:v1.1.0
sources:
- license_path: LICENSE
ref: ${image_tag}
url: https://github.com/fluxcd/helm-controller
- container_image: ghcr.io/fluxcd/kustomize-controller:v1.3.0
- container_image: ghcr.io/fluxcd/kustomize-controller:v1.4.0
sources:
- license_path: LICENSE
ref: ${image_tag%-d2iq.1}
url: https://github.com/fluxcd/kustomize-controller
- container_image: ghcr.io/fluxcd/notification-controller:v1.3.0
- container_image: ghcr.io/fluxcd/notification-controller:v1.4.0
sources:
- license_path: LICENSE
ref: ${image_tag}
url: https://github.com/fluxcd/notification-controller
- container_image: ghcr.io/fluxcd/source-controller:v1.3.0
- container_image: ghcr.io/fluxcd/source-controller:v1.4.1
sources:
- license_path: LICENSE
ref: ${image_tag}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ data:
---
kind: ConfigMap
metadata:
name: kommander-flux-2.3.0-d2iq-defaults
name: kommander-flux-2.4.0-d2iq-defaults
namespace: ${releaseNamespace}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.15.0
controller-gen.kubebuilder.io/version: v0.16.1
labels:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.3.0
app.kubernetes.io/version: v2.4.0
name: alerts.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
Expand Down Expand Up @@ -108,6 +108,7 @@ spec:
minLength: 1
type: string
required:
- kind
- name
type: object
type: array
Expand Down Expand Up @@ -145,16 +146,8 @@ spec:
properties:
conditions:
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -195,12 +188,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down Expand Up @@ -377,16 +365,8 @@ spec:
conditions:
description: Conditions holds the conditions for the Alert.
items:
description: "Condition contains details for one aspect of the current
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -427,12 +407,7 @@ spec:
- Unknown
type: string
type:
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: type of condition in CamelCase or in foo.example.com/CamelCase.
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
Loading

0 comments on commit d1f4f05

Please sign in to comment.