removing kustomize edit image

PlayFab · Jun 25, 2022 · 0e25852 · 0e25852
1 parent 21f7e16
commit 0e25852
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 14 deletions.
diff --git a/cmd/gameserverapi/deploy/default/deploy.yaml → ...eserverapi/deployment/default/deploy.yaml b/cmd/gameserverapi/deploy/default/deploy.yaml → ...eserverapi/deployment/default/deploy.yaml
@@ -16,7 +16,7 @@ spec:
         app: thundernetes-gameserverapi
     spec:
       containers:
-        - image: thundernetes-gameserverapi
+        - image: thundernetes-gameserverapi:${IMAGE_TAG}
           name: gameserverapi
           imagePullPolicy: IfNotPresent
           resources:

diff --git a/...rverapi/deploy/default/kustomization.yaml → ...api/deployment/default/kustomization.yaml b/...rverapi/deploy/default/kustomization.yaml → ...api/deployment/default/kustomization.yaml
diff --git a/...meserverapi/deploy/e2e/kustomization.yaml → ...rverapi/deployment/e2e/kustomization.yaml b/...meserverapi/deploy/e2e/kustomization.yaml → ...rverapi/deployment/e2e/kustomization.yaml
diff --git a/...ameserverapi/deploy/e2e/nodeselector.yaml → ...erverapi/deployment/e2e/nodeselector.yaml b/...ameserverapi/deploy/e2e/nodeselector.yaml → ...erverapi/deployment/e2e/nodeselector.yaml
diff --git a/e2e/run.sh b/e2e/run.sh
@@ -47,9 +47,8 @@ echo "-----Compiling, building and deploying the operator to local Kubernetes cl
 IMG=${IMAGE_NAME_OPERATOR}:${IMAGE_TAG} API_SERVICE_SECURITY=usetls make -C "${DIR}"/../pkg/operator deploye2e
 
 echo "-----Deploying GameServer API-----"
-cd cmd/gameserverapi/deploy/default
-"${DIR}"/../pkg/operator/bin/kustomize edit set image thundernetes-gameserverapi=thundernetes-gameserverapi:${IMAGE_TAG}
-"${DIR}"/../pkg/operator/bin/kustomize build ../e2e | kubectl apply -f -
+cd cmd/gameserverapi/deployment/default
+"${DIR}"/../pkg/operator/bin/kustomize build ../e2e | IMAGE_TAG=${IMAGE_TAG} envsubst | kubectl apply -f -
 
 echo "-----Waiting for Controller deployment-----"
 kubectl wait --for=condition=available --timeout=300s deployment/thundernetes-controller-manager -n thundernetes-system

diff --git a/pkg/operator/Makefile b/pkg/operator/Makefile
@@ -84,7 +84,6 @@ docker-push: ## Push docker image with the manager.
 
 .PHONY: create-install-files
 create-install-files:
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 ## Create install files for thundernetes installed without API security
 	$(KUSTOMIZE) build config/default | API_SERVICE_SECURITY=none envsubst > ${INSTALL_FILES_FOLDER}/operator.yaml
 ## Create install files for thundernetes installed with API security	
@@ -111,12 +110,10 @@ uninstall: manifests kustomize ## Uninstall CRDs from the K8s cluster specified
 
 .PHONY: deploy
 deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/default | envsubst | kubectl apply -f -
 
 .PHONY: deploye2e
 deploye2e: manifests kustomize ## Deploy controller to the K8s cluster specified in ~/.kube/config.
-	cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
 	$(KUSTOMIZE) build config/e2e | envsubst | kubectl apply -f -
 
 .PHONY: undeploy

diff --git a/pkg/operator/config/manager/kustomization.yaml b/pkg/operator/config/manager/kustomization.yaml
@@ -6,9 +6,3 @@ configMapGenerator:
 - files:
   - controller_manager_config.yaml
   name: manager-config
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: controller
-  newName: ghcr.io/playfab/thundernetes-operator
-  newTag: 0.4.1
diff --git a/pkg/operator/config/manager/manager.yaml b/pkg/operator/config/manager/manager.yaml
@@ -33,7 +33,7 @@ spec:
             - /manager
           args:
             - --leader-elect
-          image: controller:latest
+          image: ${IMG}
           imagePullPolicy: IfNotPresent
           env:
             - name: MIN_PORT