chore: remove cluster wait from packages and examples (zarf-dev#3061)

Signed-off-by: Austin Abro <[email protected]> Signed-off-by: Micah Nagel <[email protected]>
mjnagel · Oct 21, 2024 · 4ce990c · 4ce990c
1 parent e8aeb5b
commit 4ce990c
Show file tree

Hide file tree

Showing 11 changed files with 2 additions and 141 deletions.
diff --git a/examples/dos-games/zarf.yaml b/examples/dos-games/zarf.yaml
@@ -15,15 +15,6 @@ components:
           - manifests/service.yaml
     images:
       - ghcr.io/zarf-dev/doom-game:0.0.1
-    actions:
-      onDeploy:
-        after:
-          - wait:
-              cluster:
-                kind: deployment
-                name: game
-                namespace: dos-games
-                condition: available
 
 # YAML keys starting with `x-` are custom keys that are ignored by the Zarf CLI
 # The `x-mdx` key is used to render the markdown content for https://docs.zarf.dev/ref/examples

diff --git a/examples/helm-charts/zarf.yaml b/examples/helm-charts/zarf.yaml
@@ -56,33 +56,6 @@ components:
       - ghcr.io/stefanprodan/podinfo:6.4.0
       # This is the cosign signature for the podinfo image for image signature verification
       - ghcr.io/stefanprodan/podinfo:sha256-57a654ace69ec02ba8973093b6a786faa15640575fbf0dbb603db55aca2ccec8.sig
-    actions:
-      onDeploy:
-        after:
-          - wait:
-              cluster:
-                kind: deployment
-                name: podinfo-local
-                namespace: podinfo-from-local-chart
-                condition: available
-          - wait:
-              cluster:
-                kind: deployment
-                name: podinfo-oci
-                namespace: podinfo-from-oci
-                condition: available
-          - wait:
-              cluster:
-                kind: deployment
-                name: podinfo-git
-                namespace: podinfo-from-git
-                condition: available
-          - wait:
-              cluster:
-                kind: deployment
-                name: cool-release-name-podinfo
-                namespace: podinfo-from-repo
-                condition: available
 
 # YAML keys starting with `x-` are custom keys that are ignored by the Zarf CLI
 # The `x-mdx` key is used to render the markdown content for https://docs.zarf.dev/ref/examples

diff --git a/examples/manifests/zarf.yaml b/examples/manifests/zarf.yaml
@@ -12,17 +12,6 @@ components:
         files:
           # local manifests are specified relative to the `zarf.yaml` that uses them:
           - httpd-deployment.yaml
-    actions:
-      onDeploy:
-        # the following checks were computed by viewing the success state of the package deployment
-        # and creating `wait` actions that match
-        after:
-          - wait:
-              cluster:
-                kind: deployment
-                name: httpd-deployment
-                namespace: httpd
-                condition: "{.status.readyReplicas}=2"
     # image discovery is supported in all manifests and charts using:
     # zarf prepare find-images
     images:
@@ -38,17 +27,6 @@ components:
           - https://k8s.io/examples/application/deployment.yaml@c57f73449b26eae02ca2a549c388807d49ef6d3f2dc040a9bbb1290128d97157
           # this sha256 can be discovered using:
           # zarf prepare sha256sum https://k8s.io/examples/application/deployment.yaml
-    actions:
-      onDeploy:
-        # the following checks were computed by viewing the success state of the package deployment
-        # and creating `wait` actions that match
-        after:
-          - wait:
-              cluster:
-                kind: deployment
-                name: nginx-deployment
-                namespace: nginx
-                condition: available
     # image discovery is supported in all manifests and charts using:
     # zarf prepare find-images
     images:
@@ -64,17 +42,6 @@ components:
           - github.com/stefanprodan/podinfo//kustomize?ref=6.4.0
           # while ?ref= is not a requirement, it is recommended to use a specific commit hash / git tag to
           # ensure that the kustomization is not changed in a way that breaks your deployment.
-    actions:
-      onDeploy:
-        # the following checks were computed by viewing the success state of the package deployment
-        # and creating `wait` actions that match
-        after:
-          - wait:
-              cluster:
-                kind: deployment
-                name: podinfo
-                namespace: podinfo
-                condition: available
     # image discovery is supported in all manifests and charts using:
     # zarf prepare find-images
     images:

diff --git a/examples/podinfo-flux/git/podinfo-kustomization.yaml b/examples/podinfo-flux/git/podinfo-kustomization.yaml
@@ -12,3 +12,4 @@ spec:
     kind: GitRepository
     name: podinfo
   targetNamespace: podinfo-git
+  wait: true
diff --git a/examples/podinfo-flux/oci/podinfo-kustomization.yaml b/examples/podinfo-flux/oci/podinfo-kustomization.yaml
@@ -12,3 +12,4 @@ spec:
     kind: OCIRepository
     name: podinfo
   targetNamespace: podinfo-oci
+  wait: true
diff --git a/examples/podinfo-flux/zarf.yaml b/examples/podinfo-flux/zarf.yaml
@@ -33,16 +33,6 @@ components:
       - https://github.com/stefanprodan/podinfo.git
     images:
       - ghcr.io/stefanprodan/podinfo:6.4.0
-    actions:
-      onDeploy:
-        after:
-          - description: Podinfo pods to be ready via wait action
-            wait:
-              cluster:
-                kind: pod
-                name: app=podinfo
-                namespace: podinfo-git
-                condition: ready
 
   - name: podinfo-via-flux-helm
     description: Example deployment via flux (helm oci) using the famous podinfo example
@@ -57,16 +47,6 @@ components:
       - ghcr.io/stefanprodan/podinfo:6.4.0
       # Note: this is a helm OCI artifact rather than a container image
       - ghcr.io/stefanprodan/charts/podinfo:6.4.0
-    actions:
-      onDeploy:
-        after:
-          - description: Podinfo pods to be ready via wait action
-            wait:
-              cluster:
-                kind: pod
-                name: app.kubernetes.io/name=podinfo
-                namespace: podinfo-helm
-                condition: ready
 
   - name: podinfo-via-flux-oci
     description: Example deployment via flux (native oci) using the famous podinfo example
@@ -81,17 +61,6 @@ components:
       - ghcr.io/stefanprodan/podinfo:6.4.0
       # Note: this is a flux kustomize OCI artifact rather than a container image
       - ghcr.io/stefanprodan/manifests/podinfo:6.4.0
-    actions:
-      onDeploy:
-        after:
-          # This will use a wait action to wait for the podinfo pod to be ready
-          - description: Podinfo pods to be ready via wait action
-            wait:
-              cluster:
-                kind: pod
-                name: app=podinfo
-                namespace: podinfo-oci
-                condition: ready
 
 # YAML keys starting with `x-` are custom keys that are ignored by the Zarf CLI
 # The `x-mdx` key is used to render the markdown content for https://docs.zarf.dev/ref/examples

diff --git a/examples/variables/zarf.yaml b/examples/variables/zarf.yaml
@@ -81,15 +81,6 @@ components:
           - nginx-configmap.yaml
           - nginx-deployment.yaml
           - nginx-service.yaml
-    actions:
-      onDeploy:
-        after:
-          - wait:
-              cluster:
-                kind: pod
-                namespace: nginx
-                name: app=nginx
-                condition: Ready
 
 # YAML keys starting with `x-` are custom keys that are ignored by the Zarf CLI
 # The `x-mdx` key is used to render the markdown content for https://docs.zarf.dev/ref/examples

diff --git a/examples/yolo/zarf.yaml b/examples/yolo/zarf.yaml
@@ -13,15 +13,6 @@ components:
         files:
           - ../dos-games/manifests/deployment.yaml
           - ../dos-games/manifests/service.yaml
-    actions:
-      onDeploy:
-        after:
-          - wait:
-              cluster:
-                kind: deployment
-                name: game
-                namespace: zarf-yolo-example
-                condition: available
 
 # YAML keys starting with `x-` are custom keys that are ignored by the Zarf CLI
 # The `x-mdx` key is used to render the markdown content for https://docs.zarf.dev/ref/examples

diff --git a/packages/gitea/zarf.yaml b/packages/gitea/zarf.yaml
@@ -71,12 +71,6 @@ components:
               - name: GIT_SERVER_CREATE_PVC
             mute: true
         after:
-          - wait:
-              cluster:
-                kind: pod
-                namespace: zarf
-                name: app=gitea
-                condition: Ready
           - cmd: ./zarf internal create-read-only-gitea-user --no-progress
             maxRetries: 3
             maxTotalSeconds: 60

diff --git a/packages/zarf-agent/zarf.yaml b/packages/zarf-agent/zarf.yaml
@@ -40,11 +40,3 @@ components:
               windows: pwsh
             dir: ../..
             description: Build the local agent image (if 'AGENT_IMAGE_TAG' was specified as 'local')
-      onDeploy:
-        after:
-          - wait:
-              cluster:
-                kind: pod
-                namespace: zarf
-                name: app=agent-hook
-                condition: Ready
diff --git a/packages/zarf-registry/zarf.yaml b/packages/zarf-registry/zarf.yaml
@@ -171,12 +171,3 @@ components:
     images:
       # This image (or images) must match that used for injection (see zarf-config.toml)
       - "###ZARF_PKG_TMPL_REGISTRY_IMAGE_DOMAIN######ZARF_PKG_TMPL_REGISTRY_IMAGE###:###ZARF_PKG_TMPL_REGISTRY_IMAGE_TAG###"
-    actions:
-      onDeploy:
-        after:
-          - wait:
-              cluster:
-                kind: deployment
-                namespace: zarf
-                name: app=docker-registry
-                condition: Available