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

Change zarf init to always install the docker registry #82

Merged
merged 11 commits into from
Oct 6, 2021
8 changes: 4 additions & 4 deletions assets/misc/registries.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
mirrors:
registry.dso.mil:
endpoint:
- "https://zarf.localhost"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seen this behavior in some restricted environments too, so just removing for now because it doesn't really do anything for us. That, and it failed the E2E with the new mirroring setup:
https://repo1.dso.mil/platform-one/big-bang/apps/product-tools/zarf/-/jobs/7058776.

- "https://localhost"
registry1.dso.mil:
endpoint:
- "https://zarf.localhost"
- "https://localhost"
docker.io:
endpoint:
- "https://zarf.localhost"
- "https://localhost"
registry-1.docker.io:
endpoint:
- "https://zarf.localhost"
- "https://localhost"
2 changes: 1 addition & 1 deletion cli/config/config.go
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ const K3sManifestPath = "/var/lib/rancher/k3s/server/manifests"
const K3sImagePath = "/var/lib/rancher/k3s/agent/images"
const PackageInitName = "zarf-init.tar.zst"
const PackagePrefix = "zarf-package-"
const ZarfLocal = "zarf.localhost"
const ZarfLocal = "localhost"
const ZarfGitUser = "zarf-git-user"

var config ZarfConfig
2 changes: 1 addition & 1 deletion examples/gitops-data/README.md
Original file line number Diff line number Diff line change
@@ -5,4 +5,4 @@ This examples shows how to package images and repos to be loaded into the gitops
### Steps to use:
1. Create a Zarf cluster as outlined in the main [README](../../README.md#2-create-the-zarf-cluster), note the git username / password output at the end
2. Follow [step 3](../../README.md#3-add-resources-to-the-zarf-cluster) using this config in this folder
3. Run `kubectl apply -k https://zarf-git-user:$(./zarf tools get-admin-password)@zarf.localhost/zarf-git-user/mirror__github.com__stefanprodan__podinfo//kustomize` to deploy podinfo into cluster from the gitops service
3. Run `kubectl apply -k https://zarf-git-user:$(./zarf tools get-admin-password)@localhost/zarf-git-user/mirror__github.com__stefanprodan__podinfo//kustomize` to deploy podinfo into cluster from the gitops service