Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Upgrade flux to 2.1.2 #1672

Merged
merged 3 commits into from
Nov 6, 2023
+39 −39
Merged

feat: Upgrade flux to 2.1.2 #1672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dd843f7
feat: Upgrade flux to 2.1.2
Oct 15, 2023
1937e13
chore: bump image tag for license
Oct 27, 2023
17e2d2e
Merge branch 'main' into flux-update/2.1.2
takirala Nov 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
awscli 2.9.0
flux2 2.1.0
flux2 2.1.2
github-cli 2.20.2
golang 1.20
kustomize 4.5.7
Expand Down
6 changes: 3 additions & 3 deletions licenses.d2iq.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,12 +371,12 @@ resources:
- license_path: LICENSE
ref: ${image_tag}
url: https://github.com/brancz/kube-rbac-proxy
- container_image: ghcr.io/fluxcd/helm-controller:v0.36.0
- container_image: ghcr.io/fluxcd/helm-controller:v0.36.2
sources:
- license_path: LICENSE
ref: ${image_tag}
url: https://github.com/fluxcd/helm-controller
- container_image: ghcr.io/fluxcd/kustomize-controller:v1.1.0
- container_image: ghcr.io/fluxcd/kustomize-controller:v1.1.1
sources:
- license_path: LICENSE
ref: ${image_tag}
Expand All @@ -386,7 +386,7 @@ resources:
- license_path: LICENSE
ref: ${image_tag}
url: https://github.com/fluxcd/notification-controller
- container_image: ghcr.io/fluxcd/source-controller:v1.1.0
- container_image: ghcr.io/fluxcd/source-controller:v1.1.2
sources:
- license_path: LICENSE
ref: ${image_tag}
Expand Down
2 changes: 1 addition & 1 deletion ...ces/kommander-flux/2.1.0/defaults/cm.yaml → ...ces/kommander-flux/2.1.2/defaults/cm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ data:
---
kind: ConfigMap
metadata:
name: kommander-flux-2.1.0-d2iq-defaults
name: kommander-flux-2.1.2-d2iq-defaults
namespace: ${releaseNamespace}
0 ...er-flux/2.1.0/defaults/kustomization.yaml → ...er-flux/2.1.2/defaults/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...s/kommander-flux/2.1.0/kustomization.yaml → ...s/kommander-flux/2.1.2/kustomization.yaml
View file
Open in desktop
File renamed without changes.
0 ...nder-flux/2.1.0/patch-proxy-env-vars.yaml → ...nder-flux/2.1.2/patch-proxy-env-vars.yaml
View file
Open in desktop
File renamed without changes.
0 ...1.0/patch-source-ctrl-network-policy.yaml → ...1.2/patch-source-ctrl-network-policy.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...lerts.notification.toolkit.fluxcd.io.yaml → ...lerts.notification.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: alerts.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
Expand Down
2 changes: 1 addition & 1 deletion ...ion_buckets.source.toolkit.fluxcd.io.yaml → ...ion_buckets.source.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: buckets.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
Expand Down
2 changes: 1 addition & 1 deletion ...epositories.source.toolkit.fluxcd.io.yaml → ...epositories.source.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: gitrepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
Expand Down
2 changes: 1 addition & 1 deletion ..._helmcharts.source.toolkit.fluxcd.io.yaml → ..._helmcharts.source.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: helmcharts.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
Expand Down
2 changes: 1 addition & 1 deletion ..._helmreleases.helm.toolkit.fluxcd.io.yaml → ..._helmreleases.helm.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: helm-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: helmreleases.helm.toolkit.fluxcd.io
spec:
group: helm.toolkit.fluxcd.io
Expand Down
2 changes: 1 addition & 1 deletion ...epositories.source.toolkit.fluxcd.io.yaml → ...epositories.source.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: helmrepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
Expand Down
2 changes: 1 addition & 1 deletion ...izations.kustomize.toolkit.fluxcd.io.yaml → ...izations.kustomize.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: kustomize-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: kustomizations.kustomize.toolkit.fluxcd.io
spec:
group: kustomize.toolkit.fluxcd.io
Expand Down
2 changes: 1 addition & 1 deletion ...epositories.source.toolkit.fluxcd.io.yaml → ...epositories.source.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: ocirepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
Expand Down
2 changes: 1 addition & 1 deletion ...iders.notification.toolkit.fluxcd.io.yaml → ...iders.notification.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: providers.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
Expand Down
2 changes: 1 addition & 1 deletion ...ivers.notification.toolkit.fluxcd.io.yaml → ...ivers.notification.toolkit.fluxcd.io.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: receivers.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
Expand Down
4 changes: 2 additions & 2 deletions ...s/apps_v1_deployment_helm-controller.yaml → ...s/apps_v1_deployment_helm-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: helm-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
control-plane: controller
name: helm-controller
namespace: kommander-flux
Expand Down Expand Up @@ -35,7 +35,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/helm-controller:v0.36.0
image: ghcr.io/fluxcd/helm-controller:v0.36.2
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
4 changes: 2 additions & 2 deletions ...s_v1_deployment_kustomize-controller.yaml → ...s_v1_deployment_kustomize-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: kustomize-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
control-plane: controller
name: kustomize-controller
namespace: kommander-flux
Expand Down Expand Up @@ -36,7 +36,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/kustomize-controller:v1.1.0
image: ghcr.io/fluxcd/kustomize-controller:v1.1.1
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
2 changes: 1 addition & 1 deletion ...1_deployment_notification-controller.yaml → ...1_deployment_notification-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
control-plane: controller
name: notification-controller
namespace: kommander-flux
Expand Down
4 changes: 2 additions & 2 deletions ...apps_v1_deployment_source-controller.yaml → ...apps_v1_deployment_source-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
control-plane: controller
name: source-controller
namespace: kommander-flux
Expand Down Expand Up @@ -40,7 +40,7 @@ spec:
fieldPath: metadata.namespace
- name: TUF_ROOT
value: /tmp/.sigstore
image: ghcr.io/fluxcd/source-controller:v1.1.0
image: ghcr.io/fluxcd/source-controller:v1.1.2
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
0 ...r-flux/2.1.0/templates/kustomization.yaml → ...r-flux/2.1.2/templates/kustomization.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...k8s.io_v1_networkpolicy_allow-egress.yaml → ...k8s.io_v1_networkpolicy_allow-egress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: allow-egress
namespace: kommander-flux
spec:
Expand Down
2 changes: 1 addition & 1 deletion ...s.io_v1_networkpolicy_allow-scraping.yaml → ...s.io_v1_networkpolicy_allow-scraping.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: allow-scraping
namespace: kommander-flux
spec:
Expand Down
0 ...k8s.io_v1_networkpolicy_allow-source.yaml → ...k8s.io_v1_networkpolicy_allow-source.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s.io_v1_networkpolicy_allow-webhooks.yaml → ...s.io_v1_networkpolicy_allow-webhooks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: allow-webhooks
namespace: kommander-flux
spec:
Expand Down
2 changes: 1 addition & 1 deletion ...errole_crd-controller-kommander-flux.yaml → ...errole_crd-controller-kommander-flux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: crd-controller-kommander-flux
rules:
- apiGroups:
Expand Down
2 changes: 1 addition & 1 deletion ...clusterrole_flux-edit-kommander-flux.yaml → ...clusterrole_flux-edit-kommander-flux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
name: flux-edit-kommander-flux
Expand Down
2 changes: 1 addition & 1 deletion ...clusterrole_flux-view-kommander-flux.yaml → ...clusterrole_flux-view-kommander-flux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
rbac.authorization.k8s.io/aggregate-to-admin: "true"
rbac.authorization.k8s.io/aggregate-to-edit: "true"
rbac.authorization.k8s.io/aggregate-to-view: "true"
Expand Down
2 changes: 1 addition & 1 deletion ...ng_cluster-reconciler-kommander-flux.yaml → ...ng_cluster-reconciler-kommander-flux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: cluster-reconciler-kommander-flux
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion ...inding_crd-controller-kommander-flux.yaml → ...inding_crd-controller-kommander-flux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: crd-controller-kommander-flux
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
2 changes: 1 addition & 1 deletion ...emplates/v1_namespace_kommander-flux.yaml → ...emplates/v1_namespace_kommander-flux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
pod-security.kubernetes.io/warn: restricted
pod-security.kubernetes.io/warn-version: latest
name: kommander-flux
2 changes: 1 addition & 1 deletion ...cequota_critical-pods-kommander-flux.yaml → ...cequota_critical-pods-kommander-flux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: critical-pods-kommander-flux
namespace: kommander-flux
spec:
Expand Down
2 changes: 1 addition & 1 deletion ...s/v1_service_notification-controller.yaml → ...s/v1_service_notification-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
control-plane: controller
name: notification-controller
namespace: kommander-flux
Expand Down
2 changes: 1 addition & 1 deletion ...mplates/v1_service_source-controller.yaml → ...mplates/v1_service_source-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
control-plane: controller
name: source-controller
namespace: kommander-flux
Expand Down
2 changes: 1 addition & 1 deletion ...emplates/v1_service_webhook-receiver.yaml → ...emplates/v1_service_webhook-receiver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
control-plane: controller
name: webhook-receiver
namespace: kommander-flux
Expand Down
2 changes: 1 addition & 1 deletion ...es/v1_serviceaccount_helm-controller.yaml → ...es/v1_serviceaccount_helm-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: helm-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: helm-controller
namespace: kommander-flux
2 changes: 1 addition & 1 deletion ..._serviceaccount_kustomize-controller.yaml → ..._serviceaccount_kustomize-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: kustomize-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: kustomize-controller
namespace: kommander-flux
2 changes: 1 addition & 1 deletion ...rviceaccount_notification-controller.yaml → ...rviceaccount_notification-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: notification-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: notification-controller
namespace: kommander-flux
2 changes: 1 addition & 1 deletion .../v1_serviceaccount_source-controller.yaml → .../v1_serviceaccount_source-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ metadata:
app.kubernetes.io/component: source-controller
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v2.1.0
app.kubernetes.io/version: v2.1.2
name: source-controller
namespace: kommander-flux
Loading