Skip to content

Commit 25abd33

Browse files
config: default to latest samba operator image
Since using the Operator SDK to create the initial kustomization files we've defaulted to 'controller:latest' in the base yamls. However, this means one *must* use kustomize to set the image to something. Typically, we've been doing this using the Makefile. However, now that we've well established that the canonical image for the operator is at 'quay.io/samba.org/samba-operator' there's really no need to require the image to be overridden. Update the manager base YAML to default to the canonical operator image repo - and update the makefile to match. Signed-off-by: John Mulligan <[email protected]>
1 parent 6530829 commit 25abd33

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ endif
144144
.PHONY: developer-dir
145145

146146
set-image: kustomize $(MGR_KUST_DIR)/kustomization.yaml
147-
cd $(MGR_KUST_DIR) && $(KUSTOMIZE) edit set image controller=$(IMG)
147+
cd $(MGR_KUST_DIR) && $(KUSTOMIZE) edit set image quay.io/samba.org/samba-operator=$(IMG)
148148
.PHONY: set-image
149149

150150
# Generate manifests e.g. CRD, RBAC etc.

config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ spec:
3838
envFrom:
3939
- configMapRef:
4040
name: controller-cfg
41-
image: controller:latest
41+
image: quay.io/samba.org/samba-operator:latest
4242
imagePullPolicy: Always
4343
name: manager
4444
resources:

0 commit comments

Comments
 (0)