UNCLASSIFIED - NO CUI

Skip to content
Snippets Groups Projects
Commit 94cc8826 authored by Micah Nagel's avatar Micah Nagel
Browse files

Merge branch 'renovate/flux-flux' into 'master' 

Update Flux Docker tags

See merge request platform-one/big-bang/bigbang!1316
parents 64f68a38 ae7c2e08
No related branches found
No related tags found
3 merge requests!1658Draft: Merge branch 'tempo_tracing_updates' into 'master',!1386Master,!1316Update Flux Docker tags
Pipeline #681477 passed with warnings
Stage: .pre
Stage: 🔥 smoke tests
Hide whitespace changes
Inline Side-by-side
base/flux/gotk-components.yaml
+ 163
− 65
View file @ 94cc8826
--- ---
# Flux version: v0.24.0 # Flux Version: v0.26.1
# Sourced from https://github.com/fluxcd/flux2/releases assets -> install.yaml
# Then remove all components (including CRDs) that aren't part of the below list (should just be the image components)
# Components: source-controller,kustomize-controller,helm-controller,notification-controller # Components: source-controller,kustomize-controller,helm-controller,notification-controller
apiVersion: v1 apiVersion: v1
kind: Namespace kind: Namespace
...@@ -9,19 +7,21 @@ metadata: ...@@ -9,19 +7,21 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
pod-security.kubernetes.io/warn: restricted
pod-security.kubernetes.io/warn-version: latest
name: flux-system name: flux-system
--- ---
apiVersion: apiextensions.k8s.io/v1 apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.5.0 controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null creationTimestamp: null
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: alerts.notification.toolkit.fluxcd.io name: alerts.notification.toolkit.fluxcd.io
spec: spec:
group: notification.toolkit.fluxcd.io group: notification.toolkit.fluxcd.io
...@@ -233,7 +233,7 @@ metadata: ...@@ -233,7 +233,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: buckets.source.toolkit.fluxcd.io name: buckets.source.toolkit.fluxcd.io
spec: spec:
group: source.toolkit.fluxcd.io group: source.toolkit.fluxcd.io
...@@ -245,8 +245,8 @@ spec: ...@@ -245,8 +245,8 @@ spec:
scope: Namespaced scope: Namespaced
versions: versions:
- additionalPrinterColumns: - additionalPrinterColumns:
- jsonPath: .spec.url - jsonPath: .spec.endpoint
name: URL name: Endpoint
type: string type: string
- jsonPath: .status.conditions[?(@.type=="Ready")].status - jsonPath: .status.conditions[?(@.type=="Ready")].status
name: Ready name: Ready
...@@ -358,6 +358,8 @@ spec: ...@@ -358,6 +358,8 @@ spec:
- interval - interval
type: object type: object
status: status:
default:
observedGeneration: -1
description: BucketStatus defines the observed state of a bucket description: BucketStatus defines the observed state of a bucket
properties: properties:
artifact: artifact:
...@@ -491,7 +493,7 @@ metadata: ...@@ -491,7 +493,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: gitrepositories.source.toolkit.fluxcd.io name: gitrepositories.source.toolkit.fluxcd.io
spec: spec:
group: source.toolkit.fluxcd.io group: source.toolkit.fluxcd.io
...@@ -685,6 +687,8 @@ spec: ...@@ -685,6 +687,8 @@ spec:
- url - url
type: object type: object
status: status:
default:
observedGeneration: -1
description: GitRepositoryStatus defines the observed state of a Git repository. description: GitRepositoryStatus defines the observed state of a Git repository.
properties: properties:
artifact: artifact:
...@@ -848,7 +852,7 @@ metadata: ...@@ -848,7 +852,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: helmcharts.source.toolkit.fluxcd.io name: helmcharts.source.toolkit.fluxcd.io
spec: spec:
group: source.toolkit.fluxcd.io group: source.toolkit.fluxcd.io
...@@ -998,6 +1002,8 @@ spec: ...@@ -998,6 +1002,8 @@ spec:
- sourceRef - sourceRef
type: object type: object
status: status:
default:
observedGeneration: -1
description: HelmChartStatus defines the observed state of the HelmChart. description: HelmChartStatus defines the observed state of the HelmChart.
properties: properties:
artifact: artifact:
...@@ -1125,12 +1131,12 @@ apiVersion: apiextensions.k8s.io/v1 ...@@ -1125,12 +1131,12 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.5.0 controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null creationTimestamp: null
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: helmreleases.helm.toolkit.fluxcd.io name: helmreleases.helm.toolkit.fluxcd.io
spec: spec:
group: helm.toolkit.fluxcd.io group: helm.toolkit.fluxcd.io
...@@ -1435,11 +1441,20 @@ spec: ...@@ -1435,11 +1441,20 @@ spec:
with an array of operation objects. with an array of operation objects.
items: items:
description: JSON6902 is a JSON6902 operation object. description: JSON6902 is a JSON6902 operation object.
https://tools.ietf.org/html/rfc6902#section-4 https://datatracker.ietf.org/doc/html/rfc6902#section-4
properties: properties:
from: from:
description: From contains a JSON-pointer value
that references a location within the target
document where the operation is performed.
The meaning of the value depends on the value
of Op, and is NOT taken into account by all
operations.
type: string type: string
op: op:
description: Op indicates the operation to perform.
Its value MUST be one of "add", "remove",
"replace", "move", "copy", or "test". https://datatracker.ietf.org/doc/html/rfc6902#section-4
enum: enum:
- test - test
- remove - remove
...@@ -1449,8 +1464,17 @@ spec: ...@@ -1449,8 +1464,17 @@ spec:
- copy - copy
type: string type: string
path: path:
description: Path contains the JSON-pointer
value that references a location within the
target document where the operation is performed.
The meaning of the value depends on the value
of Op.
type: string type: string
value: value:
description: Value contains a valid JSON structure.
The meaning of the value depends on the value
of Op, and is NOT taken into account by all
operations.
x-kubernetes-preserve-unknown-fields: true x-kubernetes-preserve-unknown-fields: true
required: required:
- op - op
...@@ -1890,7 +1914,7 @@ metadata: ...@@ -1890,7 +1914,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: helmrepositories.source.toolkit.fluxcd.io name: helmrepositories.source.toolkit.fluxcd.io
spec: spec:
group: source.toolkit.fluxcd.io group: source.toolkit.fluxcd.io
...@@ -2003,6 +2027,8 @@ spec: ...@@ -2003,6 +2027,8 @@ spec:
- url - url
type: object type: object
status: status:
default:
observedGeneration: -1
description: HelmRepositoryStatus defines the observed state of the HelmRepository. description: HelmRepositoryStatus defines the observed state of the HelmRepository.
properties: properties:
artifact: artifact:
...@@ -2130,12 +2156,12 @@ apiVersion: apiextensions.k8s.io/v1 ...@@ -2130,12 +2156,12 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.5.0 controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null creationTimestamp: null
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: kustomizations.kustomize.toolkit.fluxcd.io name: kustomizations.kustomize.toolkit.fluxcd.io
spec: spec:
group: kustomize.toolkit.fluxcd.io group: kustomize.toolkit.fluxcd.io
...@@ -2305,13 +2331,12 @@ spec: ...@@ -2305,13 +2331,12 @@ spec:
objects, capable of targeting objects based on kind, label and annotation objects, capable of targeting objects based on kind, label and annotation
selectors. selectors.
items: items:
description: Patch contains either a StrategicMerge or a JSON6902 description: Patch contains an inline StrategicMerge or JSON6902
patch, either a file or inline, and the target the patch should patch, and the target the patch should be applied to.
be applied to.
properties: properties:
patch: patch:
description: Patch contains the JSON6902 patch document with description: Patch contains an inline StrategicMerge patch or
an array of operation objects. an inline JSON6902 patch with an array of operation objects.
type: string type: string
target: target:
description: Target points to the resources that the patch document description: Target points to the resources that the patch document
...@@ -2362,11 +2387,18 @@ spec: ...@@ -2362,11 +2387,18 @@ spec:
description: Patch contains the JSON6902 patch document with description: Patch contains the JSON6902 patch document with
an array of operation objects. an array of operation objects.
items: items:
description: JSON6902 is a JSON6902 operation object. https://tools.ietf.org/html/rfc6902#section-4 description: JSON6902 is a JSON6902 operation object. https://datatracker.ietf.org/doc/html/rfc6902#section-4
properties: properties:
from: from:
description: From contains a JSON-pointer value that references
a location within the target document where the operation
is performed. The meaning of the value depends on the
value of Op, and is NOT taken into account by all operations.
type: string type: string
op: op:
description: Op indicates the operation to perform. Its
value MUST be one of "add", "remove", "replace", "move",
"copy", or "test". https://datatracker.ietf.org/doc/html/rfc6902#section-4
enum: enum:
- test - test
- remove - remove
...@@ -2376,8 +2408,15 @@ spec: ...@@ -2376,8 +2408,15 @@ spec:
- copy - copy
type: string type: string
path: path:
description: Path contains the JSON-pointer value that
references a location within the target document where
the operation is performed. The meaning of the value
depends on the value of Op.
type: string type: string
value: value:
description: Value contains a valid JSON structure. The
meaning of the value depends on the value of Op, and
is NOT taken into account by all operations.
x-kubernetes-preserve-unknown-fields: true x-kubernetes-preserve-unknown-fields: true
required: required:
- op - op
...@@ -2828,13 +2867,12 @@ spec: ...@@ -2828,13 +2867,12 @@ spec:
objects, capable of targeting objects based on kind, label and annotation objects, capable of targeting objects based on kind, label and annotation
selectors. selectors.
items: items:
description: Patch contains either a StrategicMerge or a JSON6902 description: Patch contains an inline StrategicMerge or JSON6902
patch, either a file or inline, and the target the patch should patch, and the target the patch should be applied to.
be applied to.
properties: properties:
patch: patch:
description: Patch contains the JSON6902 patch document with description: Patch contains an inline StrategicMerge patch or
an array of operation objects. an inline JSON6902 patch with an array of operation objects.
type: string type: string
target: target:
description: Target points to the resources that the patch document description: Target points to the resources that the patch document
...@@ -2886,11 +2924,18 @@ spec: ...@@ -2886,11 +2924,18 @@ spec:
description: Patch contains the JSON6902 patch document with description: Patch contains the JSON6902 patch document with
an array of operation objects. an array of operation objects.
items: items:
description: JSON6902 is a JSON6902 operation object. https://tools.ietf.org/html/rfc6902#section-4 description: JSON6902 is a JSON6902 operation object. https://datatracker.ietf.org/doc/html/rfc6902#section-4
properties: properties:
from: from:
description: From contains a JSON-pointer value that references
a location within the target document where the operation
is performed. The meaning of the value depends on the
value of Op, and is NOT taken into account by all operations.
type: string type: string
op: op:
description: Op indicates the operation to perform. Its
value MUST be one of "add", "remove", "replace", "move",
"copy", or "test". https://datatracker.ietf.org/doc/html/rfc6902#section-4
enum: enum:
- test - test
- remove - remove
...@@ -2900,8 +2945,15 @@ spec: ...@@ -2900,8 +2945,15 @@ spec:
- copy - copy
type: string type: string
path: path:
description: Path contains the JSON-pointer value that
references a location within the target document where
the operation is performed. The meaning of the value
depends on the value of Op.
type: string type: string
value: value:
description: Value contains a valid JSON structure. The
meaning of the value depends on the value of Op, and
is NOT taken into account by all operations.
x-kubernetes-preserve-unknown-fields: true x-kubernetes-preserve-unknown-fields: true
required: required:
- op - op
...@@ -3205,11 +3257,12 @@ apiVersion: apiextensions.k8s.io/v1 ...@@ -3205,11 +3257,12 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.5.0 controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null creationTimestamp: null
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.26.1
name: providers.notification.toolkit.fluxcd.io name: providers.notification.toolkit.fluxcd.io
spec: spec:
group: notification.toolkit.fluxcd.io group: notification.toolkit.fluxcd.io
...@@ -3408,12 +3461,12 @@ apiVersion: apiextensions.k8s.io/v1 ...@@ -3408,12 +3461,12 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition kind: CustomResourceDefinition
metadata: metadata:
annotations: annotations:
controller-gen.kubebuilder.io/version: v0.5.0 controller-gen.kubebuilder.io/version: v0.7.0
creationTimestamp: null creationTimestamp: null
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: receivers.notification.toolkit.fluxcd.io name: receivers.notification.toolkit.fluxcd.io
spec: spec:
group: notification.toolkit.fluxcd.io group: notification.toolkit.fluxcd.io
...@@ -3630,7 +3683,7 @@ metadata: ...@@ -3630,7 +3683,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: helm-controller name: helm-controller
namespace: flux-system namespace: flux-system
--- ---
...@@ -3640,7 +3693,7 @@ metadata: ...@@ -3640,7 +3693,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: kustomize-controller name: kustomize-controller
namespace: flux-system namespace: flux-system
--- ---
...@@ -3650,7 +3703,7 @@ metadata: ...@@ -3650,7 +3703,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: notification-controller name: notification-controller
namespace: flux-system namespace: flux-system
--- ---
...@@ -3660,7 +3713,7 @@ metadata: ...@@ -3660,7 +3713,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: source-controller name: source-controller
namespace: flux-system namespace: flux-system
--- ---
...@@ -3670,8 +3723,8 @@ metadata: ...@@ -3670,8 +3723,8 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: crd-controller name: crd-controller-flux-system
rules: rules:
- apiGroups: - apiGroups:
- source.toolkit.fluxcd.io - source.toolkit.fluxcd.io
...@@ -3751,8 +3804,8 @@ metadata: ...@@ -3751,8 +3804,8 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: cluster-reconciler name: cluster-reconciler-flux-system
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
...@@ -3771,12 +3824,12 @@ metadata: ...@@ -3771,12 +3824,12 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: crd-controller name: crd-controller-flux-system
roleRef: roleRef:
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
kind: ClusterRole kind: ClusterRole
name: crd-controller name: crd-controller-flux-system
subjects: subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: kustomize-controller name: kustomize-controller
...@@ -3790,6 +3843,12 @@ subjects: ...@@ -3790,6 +3843,12 @@ subjects:
- kind: ServiceAccount - kind: ServiceAccount
name: notification-controller name: notification-controller
namespace: flux-system namespace: flux-system
- kind: ServiceAccount
name: image-reflector-controller
namespace: flux-system
- kind: ServiceAccount
name: image-automation-controller
namespace: flux-system
--- ---
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
...@@ -3797,7 +3856,7 @@ metadata: ...@@ -3797,7 +3856,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
control-plane: controller control-plane: controller
name: notification-controller name: notification-controller
namespace: flux-system namespace: flux-system
...@@ -3817,7 +3876,7 @@ metadata: ...@@ -3817,7 +3876,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
control-plane: controller control-plane: controller
name: source-controller name: source-controller
namespace: flux-system namespace: flux-system
...@@ -3837,7 +3896,7 @@ metadata: ...@@ -3837,7 +3896,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
control-plane: controller control-plane: controller
name: webhook-receiver name: webhook-receiver
namespace: flux-system namespace: flux-system
...@@ -3857,7 +3916,7 @@ metadata: ...@@ -3857,7 +3916,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
control-plane: controller control-plane: controller
name: helm-controller name: helm-controller
namespace: flux-system namespace: flux-system
...@@ -3876,8 +3935,8 @@ spec: ...@@ -3876,8 +3935,8 @@ spec:
spec: spec:
containers: containers:
- args: - args:
- --events-addr=http://notification-controller/ - --events-addr=http://notification-controller.flux-system.svc.cluster.local/
- --watch-all-namespaces - --watch-all-namespaces=true
- --log-level=info - --log-level=info
- --log-encoding=json - --log-encoding=json
- --enable-leader-election - --enable-leader-election
...@@ -3886,7 +3945,7 @@ spec: ...@@ -3886,7 +3945,7 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
image: fluxcd/helm-controller:v0.14.0 image: ghcr.io/fluxcd/helm-controller:v0.16.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -3896,6 +3955,7 @@ spec: ...@@ -3896,6 +3955,7 @@ spec:
ports: ports:
- containerPort: 8080 - containerPort: 8080
name: http-prom name: http-prom
protocol: TCP
- containerPort: 9440 - containerPort: 9440
name: healthz name: healthz
protocol: TCP protocol: TCP
...@@ -3912,10 +3972,18 @@ spec: ...@@ -3912,10 +3972,18 @@ spec:
memory: 64Mi memory: 64Mi
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
volumeMounts: volumeMounts:
- mountPath: /tmp - mountPath: /tmp
name: temp name: temp
nodeSelector:
kubernetes.io/os: linux
serviceAccountName: helm-controller serviceAccountName: helm-controller
terminationGracePeriodSeconds: 600 terminationGracePeriodSeconds: 600
volumes: volumes:
...@@ -3928,7 +3996,7 @@ metadata: ...@@ -3928,7 +3996,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
control-plane: controller control-plane: controller
name: kustomize-controller name: kustomize-controller
namespace: flux-system namespace: flux-system
...@@ -3947,8 +4015,8 @@ spec: ...@@ -3947,8 +4015,8 @@ spec:
spec: spec:
containers: containers:
- args: - args:
- --events-addr=http://notification-controller/ - --events-addr=http://notification-controller.flux-system.svc.cluster.local/
- --watch-all-namespaces - --watch-all-namespaces=true
- --log-level=info - --log-level=info
- --log-encoding=json - --log-encoding=json
- --enable-leader-election - --enable-leader-election
...@@ -3957,7 +4025,7 @@ spec: ...@@ -3957,7 +4025,7 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
image: fluxcd/kustomize-controller:v0.18.1 image: ghcr.io/fluxcd/kustomize-controller:v0.20.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -3967,6 +4035,7 @@ spec: ...@@ -3967,6 +4035,7 @@ spec:
ports: ports:
- containerPort: 8080 - containerPort: 8080
name: http-prom name: http-prom
protocol: TCP
- containerPort: 9440 - containerPort: 9440
name: healthz name: healthz
protocol: TCP protocol: TCP
...@@ -3983,10 +4052,18 @@ spec: ...@@ -3983,10 +4052,18 @@ spec:
memory: 64Mi memory: 64Mi
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
volumeMounts: volumeMounts:
- mountPath: /tmp - mountPath: /tmp
name: temp name: temp
nodeSelector:
kubernetes.io/os: linux
securityContext: securityContext:
fsGroup: 1337 fsGroup: 1337
serviceAccountName: kustomize-controller serviceAccountName: kustomize-controller
...@@ -4001,7 +4078,7 @@ metadata: ...@@ -4001,7 +4078,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
control-plane: controller control-plane: controller
name: notification-controller name: notification-controller
namespace: flux-system namespace: flux-system
...@@ -4020,7 +4097,7 @@ spec: ...@@ -4020,7 +4097,7 @@ spec:
spec: spec:
containers: containers:
- args: - args:
- --watch-all-namespaces - --watch-all-namespaces=true
- --log-level=info - --log-level=info
- --log-encoding=json - --log-encoding=json
- --enable-leader-election - --enable-leader-election
...@@ -4029,7 +4106,7 @@ spec: ...@@ -4029,7 +4106,7 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
image: fluxcd/notification-controller:v0.19.0 image: ghcr.io/fluxcd/notification-controller:v0.21.0
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -4039,10 +4116,13 @@ spec: ...@@ -4039,10 +4116,13 @@ spec:
ports: ports:
- containerPort: 9090 - containerPort: 9090
name: http name: http
protocol: TCP
- containerPort: 9292 - containerPort: 9292
name: http-webhook name: http-webhook
protocol: TCP
- containerPort: 8080 - containerPort: 8080
name: http-prom name: http-prom
protocol: TCP
- containerPort: 9440 - containerPort: 9440
name: healthz name: healthz
protocol: TCP protocol: TCP
...@@ -4059,10 +4139,18 @@ spec: ...@@ -4059,10 +4139,18 @@ spec:
memory: 64Mi memory: 64Mi
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
volumeMounts: volumeMounts:
- mountPath: /tmp - mountPath: /tmp
name: temp name: temp
nodeSelector:
kubernetes.io/os: linux
serviceAccountName: notification-controller serviceAccountName: notification-controller
terminationGracePeriodSeconds: 10 terminationGracePeriodSeconds: 10
volumes: volumes:
...@@ -4075,7 +4163,7 @@ metadata: ...@@ -4075,7 +4163,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
control-plane: controller control-plane: controller
name: source-controller name: source-controller
namespace: flux-system namespace: flux-system
...@@ -4096,8 +4184,8 @@ spec: ...@@ -4096,8 +4184,8 @@ spec:
spec: spec:
containers: containers:
- args: - args:
- --events-addr=http://notification-controller/ - --events-addr=http://notification-controller.flux-system.svc.cluster.local/
- --watch-all-namespaces - --watch-all-namespaces=true
- --log-level=info - --log-level=info
- --log-encoding=json - --log-encoding=json
- --enable-leader-election - --enable-leader-election
...@@ -4108,7 +4196,7 @@ spec: ...@@ -4108,7 +4196,7 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
image: fluxcd/source-controller:v0.19.0 image: ghcr.io/fluxcd/source-controller:v0.21.1
imagePullPolicy: IfNotPresent imagePullPolicy: IfNotPresent
livenessProbe: livenessProbe:
httpGet: httpGet:
...@@ -4118,10 +4206,13 @@ spec: ...@@ -4118,10 +4206,13 @@ spec:
ports: ports:
- containerPort: 9090 - containerPort: 9090
name: http name: http
protocol: TCP
- containerPort: 8080 - containerPort: 8080
name: http-prom name: http-prom
protocol: TCP
- containerPort: 9440 - containerPort: 9440
name: healthz name: healthz
protocol: TCP
readinessProbe: readinessProbe:
httpGet: httpGet:
path: / path: /
...@@ -4135,12 +4226,20 @@ spec: ...@@ -4135,12 +4226,20 @@ spec:
memory: 64Mi memory: 64Mi
securityContext: securityContext:
allowPrivilegeEscalation: false allowPrivilegeEscalation: false
capabilities:
drop:
- ALL
readOnlyRootFilesystem: true readOnlyRootFilesystem: true
runAsNonRoot: true
seccompProfile:
type: RuntimeDefault
volumeMounts: volumeMounts:
- mountPath: /data - mountPath: /data
name: data name: data
- mountPath: /tmp - mountPath: /tmp
name: tmp name: tmp
nodeSelector:
kubernetes.io/os: linux
securityContext: securityContext:
fsGroup: 1337 fsGroup: 1337
serviceAccountName: source-controller serviceAccountName: source-controller
...@@ -4157,7 +4256,7 @@ metadata: ...@@ -4157,7 +4256,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: allow-egress name: allow-egress
namespace: flux-system namespace: flux-system
spec: spec:
...@@ -4177,7 +4276,7 @@ metadata: ...@@ -4177,7 +4276,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: allow-scraping name: allow-scraping
namespace: flux-system namespace: flux-system
spec: spec:
...@@ -4197,7 +4296,7 @@ metadata: ...@@ -4197,7 +4296,7 @@ metadata:
labels: labels:
app.kubernetes.io/instance: flux-system app.kubernetes.io/instance: flux-system
app.kubernetes.io/part-of: flux app.kubernetes.io/part-of: flux
app.kubernetes.io/version: v0.24.0 app.kubernetes.io/version: v0.26.1
name: allow-webhooks name: allow-webhooks
namespace: flux-system namespace: flux-system
spec: spec:
...@@ -4209,4 +4308,3 @@ spec: ...@@ -4209,4 +4308,3 @@ spec:
app: notification-controller app: notification-controller
policyTypes: policyTypes:
- Ingress - Ingress
---
base/flux/kustomization.yaml
+ 8
− 8
View file @ 94cc8826
...@@ -4,18 +4,18 @@ resources: ...@@ -4,18 +4,18 @@ resources:
# update flux components to use ironbank images # update flux components to use ironbank images
images: images:
- name: fluxcd/helm-controller - name: ghcr.io/fluxcd/helm-controller
newName: registry1.dso.mil/ironbank/fluxcd/helm-controller newName: registry1.dso.mil/ironbank/fluxcd/helm-controller
newTag: v0.14.0 newTag: v0.16.0
- name: fluxcd/kustomize-controller - name: ghcr.io/fluxcd/kustomize-controller
newName: registry1.dso.mil/ironbank/fluxcd/kustomize-controller newName: registry1.dso.mil/ironbank/fluxcd/kustomize-controller
newTag: v0.18.1 newTag: v0.20.0
- name: fluxcd/notification-controller - name: ghcr.io/fluxcd/notification-controller
newName: registry1.dso.mil/ironbank/fluxcd/notification-controller newName: registry1.dso.mil/ironbank/fluxcd/notification-controller
newTag: v0.19.0 newTag: v0.21.0
- name: fluxcd/source-controller - name: ghcr.io/fluxcd/source-controller
newName: registry1.dso.mil/ironbank/fluxcd/source-controller newName: registry1.dso.mil/ironbank/fluxcd/source-controller
newTag: v0.19.1 newTag: v0.21.1
patches: patches:
- target: - target:
......
renovate.json
+ 1
− 1
View file @ 94cc8826
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"baseBranches": ["master"], "baseBranches": ["master"],
"configWarningReuseIssue": false, "configWarningReuseIssue": false,
"dependencyDashboard": true, "dependencyDashboard": true,
"dependencyDashboardHeader": "- [ ] If there are Flux updates: Update [Flux manifests](https://repo1.dso.mil/platform-one/big-bang/bigbang/-/blob/master/base/flux/gotk-components.yaml) to latest version based off available image versions.", "dependencyDashboardHeader": "- [ ] If there are Flux updates: Update your Flux CLI to the latest version possible based on available IB images, then from the root of the bigbang repository, run `flux install --components source-controller,kustomize-controller,helm-controller,notification-controller --export > base/flux/gotk-components.yaml` to generate the latest manifests",
"dependencyDashboardTitle": "Renovate: Update Dependencies", "dependencyDashboardTitle": "Renovate: Update Dependencies",
"draftPR": true, "draftPR": true,
"enabledManagers": ["helm-values","regex"], "enabledManagers": ["helm-values","regex"],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

UNCLASSIFIED - NO CUI