Skip to content

Commit

Permalink
get rid of sed experiment
Browse files Browse the repository at this point in the history
  • Loading branch information
docandrew committed Oct 17, 2024
1 parent cdb7756 commit 6417ee8
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ tasks:
# Workaround for https://github.com/zarf-dev/zarf/issues/2713
- description: "Modify Istio values w/ upstream registry"
cmd: "uds zarf tools yq -i '.global.proxy_init.image |= sub(\"###ZARF_REGISTRY###\", \"docker.io\") | .global.proxy.image |= sub(\"###ZARF_REGISTRY###\", \"docker.io\")' src/istio/values/upstream-values.yaml"
# cmd: "sed -i '4,$s/###ZARF_REGISTRY###/docker.io/g' src/istio/values/upstream-values.yaml"

<<<<<<< HEAD
# Workaround for https://github.com/zarf-dev/zarf/issues/2713
Expand All @@ -46,9 +45,12 @@ tasks:
- description: "Restore Istio registry values"
cmd: "uds zarf tools yq -i '.global.proxy_init.image |= sub(\"docker.io\", \"###ZARF_REGISTRY###\") | .global.proxy.image |= sub(\"docker.io\", \"###ZARF_REGISTRY###\")' src/istio/values/upstream-values.yaml"
<<<<<<< HEAD
<<<<<<< HEAD
=======
#cmd: "sed -i '4,$s/docker.io/###ZARF_REGISTRY###/g' src/istio/values/upstream-values.yaml"
>>>>>>> 550aac5 (Added image workaround for dev-setup, getting started notes)
=======
>>>>>>> de87646 (get rid of sed experiment)

# Note, this abuses the --flavor flag to only install the CRDs from this package - the "crds-only" flavor is not an explicit flavor of the package
- description: "Deploy the Prometheus-Stack source package with Zarf Dev to only install the CRDs"
Expand Down

0 comments on commit 6417ee8

Please sign in to comment.