From 2375d77c5a0d5b09cee41d291fc1d1e838a25b81 Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Fri, 10 Nov 2023 09:21:44 +1100
Subject: [PATCH] Remove quaytoken

This is now handled by the image controller
---
 deploy/base-development.sh                               | 4 ----
 deploy/operator/base/deployment.yaml                     | 9 ---------
 deploy/operator/overlays/dev-template/kustomization.yaml | 7 -------
 3 files changed, 20 deletions(-)

diff --git a/deploy/base-development.sh b/deploy/base-development.sh
index 2636aca0cd..b406fb06c7 100755
--- a/deploy/base-development.sh
+++ b/deploy/base-development.sh
@@ -19,10 +19,6 @@ kubectl apply -f $DIR/namespace.yaml
 kubectl config set-context --current --namespace=test-jvm-namespace
 kubectl delete --ignore-not-found secret jvm-build-image-secrets jvm-build-git-secrets jvm-build-maven-repo-secrets jvm-build-maven-repo-aws-secrets jvm-build-s3-secrets jvm-build-git-repo-secrets
 
-if [ -n "$QUAY_ORG" ] && [ -n "$QUAY_TOKEN" ]; then
-    kubectl delete --ignore-not-found secret  -n image-controller quaytoken
-    kubectl create secret generic -n image-controller quaytoken --from-literal "quaytoken=$QUAY_TOKEN" --from-literal "organization=$QUAY_ORG"
-fi
 kubectl create secret generic jvm-build-image-secrets --from-file=.dockerconfigjson=$HOME/.docker/config.json --type=kubernetes.io/dockerconfigjson
 kubectl create secret generic jvm-build-git-secrets --from-literal .git-credentials="
 https://$GITHUB_E2E_ORGANIZATION:$GITHUB_TOKEN@github.com
diff --git a/deploy/operator/base/deployment.yaml b/deploy/operator/base/deployment.yaml
index 2f59813bd8..e86c18e750 100644
--- a/deploy/operator/base/deployment.yaml
+++ b/deploy/operator/base/deployment.yaml
@@ -13,11 +13,6 @@ spec:
       labels:
         app: hacbs-jvm-operator
     spec:
-      volumes:
-        - name: quaytoken
-          secret:
-            optional: false
-            secretName: quaytoken
       securityContext:
         runAsNonRoot: true
       containers:
@@ -37,10 +32,6 @@ spec:
             limits:
               memory: "1024Mi"
               cpu: "500m"
-          volumeMounts:
-            - mountPath: "/workspace"
-              name: quaytoken
-              readOnly: true
           securityContext:
             readOnlyRootFilesystem: true
       serviceAccountName: hacbs-jvm-operator
diff --git a/deploy/operator/overlays/dev-template/kustomization.yaml b/deploy/operator/overlays/dev-template/kustomization.yaml
index cdb4b38ee2..5544f7b75e 100644
--- a/deploy/operator/overlays/dev-template/kustomization.yaml
+++ b/deploy/operator/overlays/dev-template/kustomization.yaml
@@ -24,10 +24,3 @@ patches:
       kind: Deployment
       name: hacbs-jvm-operator
 
-  - patch: |-
-      - op: replace
-        path: /spec/template/spec/volumes/0/secret/optional
-        value: true
-    target:
-      kind: Deployment
-      name: hacbs-jvm-operator