Skip to content

Commit 282aee3

Browse files
authored
Merge pull request #5996 from fluxcd/backport-5995-to-release/v2.9.x
[release/v2.9.x] Include source-watcher to oci flux-manifests
2 parents 6a650db + 9cd1567 commit 282aee3

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ jobs:
130130
run: |
131131
mkdir -p ./ghcr.io/flux-system
132132
flux install --registry=ghcr.io/fluxcd \
133-
--components-extra=image-reflector-controller,image-automation-controller \
133+
--components-extra=image-reflector-controller,image-automation-controller,source-watcher \
134134
--export > ./ghcr.io/flux-system/gotk-components.yaml
135135
136136
cd ./ghcr.io && flux push artifact \
@@ -142,7 +142,7 @@ jobs:
142142
run: |
143143
mkdir -p ./docker.io/flux-system
144144
flux install --registry=docker.io/fluxcd \
145-
--components-extra=image-reflector-controller,image-automation-controller \
145+
--components-extra=image-reflector-controller,image-automation-controller,source-watcher \
146146
--export > ./docker.io/flux-system/gotk-components.yaml
147147
148148
cd ./docker.io && flux push artifact \

cmd/flux/install.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,14 @@ If a previous version is installed, then an in-place upgrade will be performed.`
5353
# Install all components including the image automation ones
5454
flux install --components-extra="image-reflector-controller,image-automation-controller"
5555
56+
# Install all components including source-watcher
57+
flux install --components-extra="source-watcher"
58+
5659
# Install Flux onto tainted Kubernetes nodes
5760
flux install --toleration-keys=node.kubernetes.io/dedicated-to-flux
5861
5962
# Dry-run install
60-
flux install --export | kubectl apply --dry-run=client -f-
63+
flux install --export | kubectl apply --dry-run=client -f-
6164
6265
# Write install manifests to file
6366
flux install --export > flux-system.yaml`,

0 commit comments

Comments
 (0)