update pull secrets for all yamls

zarf-dev · Dec 2, 2021 · ac3ca07 · ac3ca07
1 parent 46bb4df
commit ac3ca07
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 163 deletions.
diff --git a/assets/charts/gitea-values.yaml b/assets/charts/gitea-values.yaml
@@ -1,5 +1,7 @@
 persistence:
   storageClass: local-path
+imagePullSecrets:
+  - "zarf-registry"
 gitea:
   admin:
     username: "zarf-git-user"

diff --git a/assets/charts/pgl-values.yaml b/assets/charts/pgl-values.yaml
@@ -1,12 +1,21 @@
+loki:
+  image:
+    pullSecrets:
+      - "zarf-registry"
 grafana:
   enabled: true
   adminUser: "zarf-admin"
   adminPassword: "###ZARF_SECRET###"
+  image:
+    pullSecrets:
+      - "zarf-registry"
   grafana.ini:
     server:
       root_url: "%(protocol)s://%(domain)s/monitor"
       serve_from_sub_path: true
 promtail:
+  imagePullSecrets:
+    - "zarf-registry"
   extraScrapeConfigs:
     - job_name: journal
       journal:
@@ -29,5 +38,3 @@ promtail:
     - name: journal
       mountPath: /var/log/journal
       readOnly: true
-image:
-  pullPolicy: Never
diff --git a/assets/charts/registry-values.yaml b/assets/charts/registry-values.yaml
@@ -3,7 +3,7 @@ persistence:
   storageClass: local-path
 image:
   repository: "registry1.dso.mil/ironbank/opensource/docker/registry-v2"
-imagePullSecrets: private-registry  
+imagePullSecrets: zarf-registry  
 secrets:
   htpasswd: "###ZARF_HTPASSWD###"
 resources:

diff --git a/cli/zarf.yaml b/cli/zarf.yaml
@@ -7,14 +7,18 @@ metadata:
 components:
   - name: baseline
     required: true
-    charts:
-      - name: docker-registry
-        url: https://helm.twun.io
-        version: 1.10.1
-      - name: gatekeeper
-        url: https://repo1.dso.mil/platform-one/big-bang/apps/core/policy.git
-        version: 3.5.1-bb.10
-    images:
-      - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.3.0
-    repos:
-      - https://repo1.dso.mil/platform-one/big-bang/apps/core/[email protected]
+    appliance:
+      charts:
+        - name: docker-registry
+          url: https://helm.twun.io
+          version: 1.10.1
+          namespace: registry
+        - name: gatekeeper
+          url: https://repo1.dso.mil/platform-one/big-bang/apps/core/policy.git
+          version: 3.5.1-bb.10
+          namespace: gatekeeper
+      images:
+        - registry1.dso.mil/ironbank/kiwigrid/k8s-sidecar:1.3.0
+    gitops:
+      repos:
+        - https://repo1.dso.mil/platform-one/big-bang/apps/core/[email protected]
diff --git a/examples/big-bang/manifests/other_manifests.yaml b/examples/big-bang/manifests/other_manifests.yaml
@@ -7,31 +7,3 @@ metadata:
 stringData:
   username: "zarf-git-user"
   password: "###ZARF_SECRET###"
----
-apiVersion: v1
-kind: Secret
-type: kubernetes.io/dockerconfigjson
-metadata:
-  name: private-registry
-  namespace: flux-system
-stringData:
-  .dockerconfigjson: |
-    {
-      "auths": {
-        "registry.dso.mil": {
-          "auth":"###ZARF_DOCKERAUTH###"
-        },
-        "registry1.dso.mil": {
-          "auth":"###ZARF_DOCKERAUTH###"
-        },
-        "docker.io": {
-          "auth":"###ZARF_DOCKERAUTH###"
-        },
-        "registry-1.docker.io": {
-          "auth":"###ZARF_DOCKERAUTH###"
-        },
-        "ghcr.io": {
-          "auth":"###ZARF_DOCKERAUTH###"
-        }
-      }
-    }
diff --git a/examples/data-injection/manifests/data-injection.yaml b/examples/data-injection/manifests/data-injection.yaml
@@ -17,4 +17,4 @@ spec:
       image: registry1.dso.mil/ironbank/redhat/ubi/ubi8:8.4
       command: ["/bin/sh", "-ec", "mkdir -p /test && while :; do ls -lah /test; sleep 5 ; done"]
   imagePullSecrets:
-    - name: private-registry
+    - name: zarf-registry
diff --git a/examples/data-injection/manifests/image-pull-secret.yaml b/examples/data-injection/manifests/image-pull-secret.yaml
diff --git a/examples/postgres-operator/manifests/image-pull-secret.yaml b/examples/postgres-operator/manifests/image-pull-secret.yaml
diff --git a/examples/postgres-operator/values/minio-operator.yaml b/examples/postgres-operator/values/minio-operator.yaml
@@ -1,5 +1,5 @@
 imagePullSecrets:
-  - name: private-registry
+  - name: zarf-registry
 operator:
   image:
     repository: registry1.dso.mil/ironbank/opensource/minio/operator

diff --git a/examples/postgres-operator/values/pgadmin.yaml b/examples/postgres-operator/values/pgadmin.yaml
@@ -3,7 +3,7 @@
   # repository: ??
   # tag: ??
 imagePullSecrets:
-  - name: private-registry
+  - name: zarf-registry
 serviceAccount:
   create: true
 persistentVolume:

diff --git a/examples/postgres-operator/values/postgres-operator-ui.yaml b/examples/postgres-operator/values/postgres-operator-ui.yaml
@@ -3,7 +3,7 @@
   # repository: ??
   # tag: ??
 imagePullSecrets:
-  - name: private-registry
+  - name: zarf-registry
 resources:
   requests:
     cpu: "100m"

diff --git a/examples/postgres-operator/values/postgres-operator.yaml b/examples/postgres-operator/values/postgres-operator.yaml
@@ -6,7 +6,7 @@
 # configGeneral:
   # docker_image: registry1.dso.mil/.../spilo-13:2.1-p1
 imagePullSecrets:
-  - name: private-registry
+  - name: zarf-registry
 configPostgresPodResources:
   default_cpu_request: "100m"
   default_memory_request: "100Mi"

diff --git a/examples/single-big-bang-package/manifests/image-pull-secret.yaml b/examples/single-big-bang-package/manifests/image-pull-secret.yaml
diff --git a/examples/single-big-bang-package/twistlock-values.yaml b/examples/single-big-bang-package/twistlock-values.yaml
@@ -1,2 +1,2 @@
 imagePullSecrets:
-  - name: private-registry
+  - name: zarf-registry