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.

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 0.31.0 #427

Merged
merged 2 commits into from
Jun 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
awscli 2.4.24
flux2 0.30.2
flux2 0.31.0
github-cli 2.5.2
golang 1.17.7
kustomize 4.5.2
Expand Down
10 changes: 10 additions & 0 deletions hack/flux/flux-update-kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,13 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- flux.yaml
patches:
- target:
group: apps
version: v1
kind: Deployment
name: kustomize-controller
patch: |-
- op: add
path: /spec/template/spec/containers/0/args/-
value: --no-remote-bases=true
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ data:
---
kind: ConfigMap
metadata:
name: kommander-flux-0.30.2-d2iq-defaults
name: kommander-flux-0.31.0-d2iq-defaults
namespace: ${releaseNamespace}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: alerts.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: buckets.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: gitrepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
Expand Down Expand Up @@ -655,6 +655,15 @@ spec:
- type
type: object
type: array
contentConfigChecksum:
description: 'ContentConfigChecksum is a checksum of all the configurations
related to the content of the source artifact: - .spec.ignore -
.spec.recurseSubmodules - .spec.included and the checksum of the
included artifacts observed in .status.observedGeneration version
of the object. This can be used to determine if the content of the
included repository has changed. It has the format of `<algo>:<checksum>`,
for example: `sha256:<checksum>`.'
type: string
includedArtifacts:
description: IncludedArtifacts contains a list of the last successfully
included Artifacts as instructed by GitRepositorySpec.Include.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: helmcharts.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: helmreleases.helm.toolkit.fluxcd.io
spec:
group: helm.toolkit.fluxcd.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: helmrepositories.source.toolkit.fluxcd.io
spec:
group: source.toolkit.fluxcd.io
Expand Down Expand Up @@ -332,6 +332,13 @@ spec:
default: 60s
description: Timeout of the index fetch operation, defaults to 60s.
type: string
type:
description: Type of the HelmRepository. When this field is set to "oci",
the URL field value must be prefixed with "oci://".
enum:
- default
- oci
type: string
url:
description: URL of the Helm repository, a valid URL contains at least
a protocol and host.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: kustomizations.kustomize.toolkit.fluxcd.io
spec:
group: kustomize.toolkit.fluxcd.io
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: providers.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
Expand Down Expand Up @@ -105,6 +105,7 @@ spec:
- opsgenie
- alertmanager
- grafana
- githubdispatch
type: string
username:
description: Bot username for this provider
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: receivers.notification.toolkit.fluxcd.io
spec:
group: notification.toolkit.fluxcd.io
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
control-plane: controller
name: helm-controller
namespace: kommander-flux
Expand Down Expand Up @@ -33,7 +33,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/helm-controller:v0.21.0
image: ghcr.io/fluxcd/helm-controller:v0.22.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
control-plane: controller
name: kustomize-controller
namespace: kommander-flux
Expand All @@ -28,12 +28,13 @@ spec:
- --log-level=info
- --log-encoding=json
- --enable-leader-election
- --no-remote-bases=true
env:
- name: RUNTIME_NAMESPACE
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/kustomize-controller:v0.25.0
image: ghcr.io/fluxcd/kustomize-controller:v0.26.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
control-plane: controller
name: notification-controller
namespace: kommander-flux
Expand Down Expand Up @@ -32,7 +32,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/notification-controller:v0.23.5
image: ghcr.io/fluxcd/notification-controller:v0.24.0
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
control-plane: controller
name: source-controller
namespace: kommander-flux
Expand Down Expand Up @@ -37,7 +37,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: metadata.namespace
image: ghcr.io/fluxcd/source-controller:v0.24.4
image: ghcr.io/fluxcd/source-controller:v0.25.3
imagePullPolicy: IfNotPresent
livenessProbe:
httpGet:
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
name: allow-egress
namespace: kommander-flux
spec:
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
name: allow-scraping
namespace: kommander-flux
spec:
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
name: allow-webhooks
namespace: kommander-flux
spec:
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
name: crd-controller-kommander-flux
rules:
- apiGroups:
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
name: cluster-reconciler-kommander-flux
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
name: crd-controller-kommander-flux
roleRef:
apiGroup: rbac.authorization.k8s.io
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
pod-security.kubernetes.io/warn: restricted
pod-security.kubernetes.io/warn-version: latest
name: kommander-flux
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: v0.30.2
app.kubernetes.io/version: v0.31.0
control-plane: controller
name: notification-controller
namespace: kommander-flux
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
control-plane: controller
name: source-controller
namespace: kommander-flux
Expand Down
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: v0.30.2
app.kubernetes.io/version: v0.31.0
control-plane: controller
name: webhook-receiver
namespace: kommander-flux
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: helm-controller
namespace: kommander-flux
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: kustomize-controller
namespace: kommander-flux
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: notification-controller
namespace: kommander-flux
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ metadata:
labels:
app.kubernetes.io/instance: kommander-flux
app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.30.2
app.kubernetes.io/version: v0.31.0
name: source-controller
namespace: kommander-flux
2 changes: 1 addition & 1 deletion services/kommander/0.3.0/defaults/cm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ data:
cert-manager: "1.7.1"
karma-traefik: "0.0.1"
gatekeeper: "3.7.0"
kommander-flux: "0.30.2"
kommander-flux: "0.31.0"