Rename DefaultAuthorinoImage and set in Dockerfile

Co-authored-by: Grzegorz Piotrowski <[email protected]>
Kuadrant · Jul 28, 2023 · ebce65b · ebce65b
1 parent 93fc61c
commit ebce65b
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ COPY pkg/ pkg/
 
 ARG VERSION=latest
 ARG DEFAULT_AUTHORINO_IMAGE=quay.io/kuadrant/authorino:latest
-RUN CGO_ENABLED=0 GO111MODULE=on go build -a -ldflags "-X main.version=${VERSION} -X controllers.defaultAuthorinoImage=${DEFAULT_AUTHORINO_IMAGE}" -o manager main.go
+RUN CGO_ENABLED=0 GO111MODULE=on go build -a -ldflags "-X main.version=${VERSION} -X github.com/kuadrant/authorino-operator/controllers.DefaultAuthorinoImage=${DEFAULT_AUTHORINO_IMAGE}" -o manager main.go
 
 # Use Red Hat minimal base image to package the binary
 # https://catalog.redhat.com/software/containers/ubi9-minimal

diff --git a/Makefile b/Makefile
@@ -167,10 +167,10 @@ test: manifests generate fmt vet setup-envtest
 ##@ Build
 
 build: generate fmt vet ## Build manager binary.
-	go build -ldflags "-X main.version=$(VERSION) -X github.com/kuadrant/authorino-operator/controllers.defaultAuthorinoImage=$(DEFAULT_AUTHORINO_IMAGE)" -o bin/manager main.go
+	go build -ldflags "-X main.version=$(VERSION) -X github.com/kuadrant/authorino-operator/controllers.DefaultAuthorinoImage=$(DEFAULT_AUTHORINO_IMAGE)" -o bin/manager main.go
 
 run: manifests generate fmt vet ## Run a controller from your host.
-	go run -ldflags "-X main.version=$(VERSION) -X github.com/kuadrant/authorino-operator/controllers.defaultAuthorinoImage=$(DEFAULT_AUTHORINO_IMAGE)" ./main.go
+	go run -ldflags "-X main.version=$(VERSION) -X github.com/kuadrant/authorino-operator/controllers.DefaultAuthorinoImage=$(DEFAULT_AUTHORINO_IMAGE)" ./main.go
 
 docker-build:  ## Build docker image with the manager.
 	docker build --build-arg VERSION=$(VERSION) --build-arg DEFAULT_AUTHORINO_IMAGE=$(DEFAULT_AUTHORINO_IMAGE) -t $(OPERATOR_IMAGE) .
@@ -252,7 +252,7 @@ fix-csv-replaces: $(YQ)
 	V="authorino-operator.$(REPLACES_VERSION)" $(YQ) eval '.spec.replaces = strenv(V)' -i bundle/manifests/authorino-operator.clusterserviceversion.yaml
 
 .PHONY: prepare-release
-prepare-release: 
+prepare-release:
 	$(MAKE) manifests bundle VERSION=$(VERSION) AUTHORINO_VERSION=$(AUTHORINO_VERSION)
 	@if [ "$(AUTHORINO_VERSION)" = "latest" ]; then\
 		[ -e "$(AUTHORINO_IMAGE_FILE)" ] && rm $(AUTHORINO_IMAGE_FILE); \

diff --git a/controllers/authorino_controller.go b/controllers/authorino_controller.go
@@ -192,7 +192,7 @@ func (r *AuthorinoReconciler) buildAuthorinoDeployment(authorino *api.Authorino)
 	var saName = authorino.Name + "-authorino"
 
 	if authorino.Spec.Image == "" {
-		authorino.Spec.Image = defaultAuthorinoImage
+		authorino.Spec.Image = DefaultAuthorinoImage
 	}
 
 	var volumes []k8score.Volume

diff --git a/controllers/authorino_controller_test.go b/controllers/authorino_controller_test.go
@@ -121,7 +121,7 @@ var _ = Describe("Authorino controller", func() {
 			}, testTimeout, testInterval).Should(BeTrue())
 
 			replicas := int32(testAuthorinoReplicas)
-			image := defaultAuthorinoImage
+			image := DefaultAuthorinoImage
 			existContainer := false
 
 			Expect(deployment.Spec.Replicas).Should(Equal(&replicas))

diff --git a/controllers/constants.go b/controllers/constants.go
@@ -90,4 +90,4 @@ const (
 )
 
 // ldflags
-var defaultAuthorinoImage string
+var DefaultAuthorinoImage string
diff --git a/main.go b/main.go
@@ -67,7 +67,7 @@ func main() {
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
-	setupLog.Info("botting up authorino operator", "version", version)
+	setupLog.Info("botting up authorino operator", "version", version, "default authorino image", controllers.DefaultAuthorinoImage)
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,