Skip to content

Commit e06752f

Browse files
authored
fix: Bump flux-operator version and fix first start issues (#45)
1 parent a4b2661 commit e06752f

File tree

2 files changed

+36
-2
lines changed

2 files changed

+36
-2
lines changed

bootstrap/bootstrap.yml

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,15 @@ spec:
203203
Registry address to pull the distribution images from
204204
e.g. 'ghcr.io/fluxcd'.
205205
type: string
206+
variant:
207+
description: |-
208+
Variant specifies the Flux distribution flavor stored
209+
in the registry.
210+
enum:
211+
- upstream-alpine
212+
- enterprise-alpine
213+
- enterprise-distroless
214+
type: string
206215
version:
207216
description: Version semver expression e.g. '2.x', '2.3.x'.
208217
type: string
@@ -583,6 +592,12 @@ spec:
583592
LastAttemptedRevision is the version and digest of the
584593
distribution config that was last attempted to reconcile.
585594
type: string
595+
lastHandledForceAt:
596+
description: |-
597+
LastHandledForceAt holds the value of the most recent
598+
force request value, so a change of the annotation value
599+
can be detected.
600+
type: string
586601
lastHandledReconcileAt:
587602
description: |-
588603
LastHandledReconcileAt holds the value of the most recent
@@ -1779,7 +1794,11 @@ spec:
17791794
valueFrom:
17801795
fieldRef:
17811796
fieldPath: metadata.namespace
1782-
image: ghcr.io/controlplaneio-fluxcd/flux-operator:v0.30.0
1797+
- name: KUBERNETES_SERVICE_HOST
1798+
value: 127.0.0.1
1799+
- name: KUBERNETES_SERVICE_PORT
1800+
value: "6443"
1801+
image: ghcr.io/controlplaneio-fluxcd/flux-operator:v0.33.0
17831802
imagePullPolicy: IfNotPresent
17841803
livenessProbe:
17851804
httpGet:

bootstrap/bootstrap/kustomization.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- https://github.com/controlplaneio-fluxcd/flux-operator/releases/download/v0.30.0/install.yaml
4+
- https://github.com/controlplaneio-fluxcd/flux-operator/releases/download/v0.33.0/install.yaml
55
- instance.yml
66
- spectrum.yml
77

@@ -51,3 +51,18 @@ patches:
5151
- op: add
5252
path: /spec/template/metadata/labels/app.kubernetes.io~1instance
5353
value: flux-operator
54+
- target:
55+
kind: Deployment
56+
name: flux-operator
57+
namespace: flux-system
58+
patch: |-
59+
- op: add
60+
path: /spec/template/spec/containers/0/env/-
61+
value:
62+
name: KUBERNETES_SERVICE_HOST
63+
value: "127.0.0.1"
64+
- op: add
65+
path: /spec/template/spec/containers/0/env/-
66+
value:
67+
name: KUBERNETES_SERVICE_PORT
68+
value: "6443"

0 commit comments

Comments
 (0)