config: remove placeholder secret

config/manager/deployment.yaml

@@ -19,18 +19,6 @@ kind: Namespace
 metadata:
   name: cartographer-system
 
----
-apiVersion: v1
-kind: Secret
-metadata:
-  name: private-registry-credentials
-  namespace: cartographer-system
-  annotations:
-    secretgen.carvel.dev/image-pull-secret: ""
-type: kubernetes.io/dockerconfigjson
-data:
-  .dockerconfigjson: e30K
-
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -51,8 +39,6 @@ spec:
         app: cartographer-controller
     spec:
       serviceAccount: cartographer-controller
-      imagePullSecrets:
-        - name: private-registry-credentials
       volumes:
         - name: cert
           secret:

hack/setup.sh

@@ -35,7 +35,6 @@ readonly CERT_MANAGER_VERSION=1.5.3
 readonly KAPP_CONTROLLER_VERSION=0.32.0
 readonly KNATIVE_SERVING_VERSION=0.26.0
 readonly KPACK_VERSION=0.5.1
-readonly SECRETGEN_CONTROLLER_VERSION=0.6.0
 readonly SOURCE_CONTROLLER_VERSION=0.17.0
 readonly TEKTON_VERSION=0.30.0
 readonly GIT_SERVE_VERSION=0.0.5
@@ -55,7 +54,6 @@ main() {
                         start_local_cluster
                         install_cert_manager
                         install_kapp_controller
-                        install_secretgen_controller
                         ;;
 
                 cartographer)
@@ -125,8 +123,7 @@ install_cartographer() {
                 ./hack/release.sh
 
         ytt --ignore-unknown-comments \
-                --data-value registry="$REGISTRY" \
-                -f ./hack/registry-auth |
+                --data-value registry="$REGISTRY" |
                 kapp deploy -a cartographer --yes \
                         -f ./release \
                         -f-
@@ -178,28 +175,13 @@ display_vars() {
 start_registry() {
         log "starting registry"
 
-        echo -e "\n\nregistry credentials:\n
-        username: admin
-        password: admin
-        "
-
-        env DOCKER_USERNAME=admin \
-                DOCKER_PASSWORD=admin \
-                DOCKER_REGISTRY="$REGISTRY" \
-                DOCKER_CONFIG="$DOCKER_CONFIG" \
-                "$DIR/docker-login.sh"
-
         docker container inspect $REGISTRY_CONTAINER_NAME &>/dev/null && {
                 echo "registry already exists"
                 return
         }
 
         docker run \
                 --detach \
-                -v "$DIR/registry-auth:/auth" \
-                -e "REGISTRY_AUTH=htpasswd" \
-                -e "REGISTRY_AUTH_HTPASSWD_REALM=Registry Realm" \
-                -e "REGISTRY_AUTH_HTPASSWD_PATH=/auth/htpasswd" \
                 --name "$REGISTRY_CONTAINER_NAME" \
                 --publish "${REGISTRY_PORT}":5000 \
                 registry:2
@@ -280,13 +262,6 @@ install_kapp_controller() {
                 kapp deploy --yes -a kapp-controller -f-
 }
 
-install_secretgen_controller() {
-        ytt --ignore-unknown-comments \
-                -f "$DIR/overlays/remove-resource-requests-from-deployments.yaml" \
-                -f https://github.com/vmware-tanzu/carvel-secretgen-controller/releases/download/v$SECRETGEN_CONTROLLER_VERSION/release.yml |
-                kapp deploy --yes -a secretgen-controller -f-
-}
-
 install_knative_serving() {
         ytt --ignore-unknown-comments \
                 -f https://github.com/knative/serving/releases/download/v$KNATIVE_SERVING_VERSION/serving-core.yaml \
@@ -313,15 +288,11 @@ setup_example_sc() {
                 -f "$DIR/../examples/shared" \
                 -f "$DIR/../examples/$test_name/values.yaml" \
                 --data-value registry.server="$REGISTRY" \
-                --data-value registry.username=admin \
-                --data-value registry.password=admin \
                 --data-value image_prefix="$REGISTRY/example-$test_name-")
         kapp deploy --yes -a "example-$test_name" \
             -f <(ytt --ignore-unknown-comments \
                 -f "$DIR/../examples/$test_name" \
                 --data-value registry.server="$REGISTRY" \
-                --data-value registry.username=admin \
-                --data-value registry.password=admin \
                 --data-value workload_name="$test_name" \
                 --data-value image_prefix="$REGISTRY/example-$test_name-")
 }
@@ -471,16 +442,12 @@ setup_source_to_gitops() {
           -f "$DIR/../examples/shared" \
           -f "$DIR/../examples/$test_name/values.yaml" \
           --data-value registry.server="$REGISTRY" \
-          --data-value registry.username=admin \
-          --data-value registry.password=admin \
           --data-value image_prefix="$REGISTRY/example-$test_name-")
 
       kapp deploy --yes -a "example-$test_name" \
         -f <(ytt --ignore-unknown-comments \
           -f "$DIR/../examples/$test_name" \
           --data-value registry.server="$REGISTRY" \
-          --data-value registry.username=admin \
-          --data-value registry.password=admin \
           --data-value workload_name="$test_name" \
           --data-value image_prefix="$REGISTRY/example-$test_name-" \
           --data-value source_repo.url="https://github.com/kontinue/hello-world" \

hack/upgrade-test.sh

@@ -79,7 +79,6 @@ install_cartographer_from_current_commit() {
 
   ytt --ignore-unknown-comments \
     --data-value registry="$REGISTRY" \
-    -f "$DIR/registry-auth" \
     -f "$DIR/overlays/remove-resource-requests-from-deployments.yaml" \
     -f release/cartographer.yaml |
     kapp deploy --yes -a cartographer -f-