Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove cluster wait from packages and examples #3061

Merged
merged 17 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions examples/dos-games/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
27 changes: 0 additions & 27 deletions examples/helm-charts/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
33 changes: 0 additions & 33 deletions examples/manifests/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
1 change: 1 addition & 0 deletions examples/podinfo-flux/git/podinfo-kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ spec:
kind: GitRepository
name: podinfo
targetNamespace: podinfo-git
wait: true
1 change: 1 addition & 0 deletions examples/podinfo-flux/oci/podinfo-kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ spec:
kind: OCIRepository
name: podinfo
targetNamespace: podinfo-oci
wait: true
31 changes: 0 additions & 31 deletions examples/podinfo-flux/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
9 changes: 0 additions & 9 deletions examples/variables/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions examples/yolo/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions packages/gitea/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 0 additions & 8 deletions packages/zarf-agent/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 0 additions & 9 deletions packages/zarf-registry/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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