Skip to content

Commit

Permalink
test new Flux release
Browse files Browse the repository at this point in the history
for fluxcd/flux#3616,
fluxcd/flux#3615

* add a bunch of excludes to helmrelease for flux v1
* kustomize resource is not relevant for flux v1

The old kustomize should not be used as it is unsafe

* flux should not scan for kindest images either
* fixup index.docker.io

Signed-off-by: Kingdon Barrett <[email protected]>
  • Loading branch information
Kingdon Barrett committed May 26, 2022
1 parent 87fb9da commit b5d17e0
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 8 deletions.
4 changes: 4 additions & 0 deletions infrastructure/flux-legacy/helmrelease.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ spec:
interval: 10m0s
timeout: 1m0s
values:
image:
tag: 1.25.2
git:
url: [email protected]:kingdonb/tailscale-k8s.git
branch: main
Expand All @@ -26,3 +28,5 @@ spec:
options:
- name: ndots
value: "1"
registry:
excludeImage: cr.l5d.io/linkerd/*,docker.l5d.io/buoyantio/*,ghcr.io/fluxcd/*,ghcr.io/linuxserver/*,index.docker.io/kingdonb/*,index.docker.io/jenkins/*,index.docker.io/library/*,index.docker.io/okteto/*,index.docker.io/weaveworks/*,index.docker.io/grafana/*,index.docker.io/datawire/*,index.docker.io/hephy/*,index.docker.io/fluxcd/*,index.docker.io/prom/*,index.docker.io/buoyantio/*,index.docker.io/kiwigrid/*,index.docker.io/rancher/*,k8s.gcr.io/metrics-server/*,k8s.gcr.io/ingress-nginx/*,k8s.gcr.io/kube-state-metrics/*,k8s.gcr.io/coredns/*,k8s.gcr.io/kube-proxy,quay.io/keycloak/*,quay.io/jetstack/*,quay.io/metallb/*,quay.io/kiwigrid/*,quay.io/prometheus/*,quay.io/prometheus-operator/*,127.0.0.1:5555/*,index.docker.io/kindest/*
16 changes: 8 additions & 8 deletions legacy/tailscale/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: tailscale
resources:
- role.yaml
- rolebinding.yaml
- sa.yaml
- subnet-router.yaml
# apiVersion: kustomize.config.k8s.io/v1beta1
# kind: Kustomization
# namespace: tailscale
# resources:
# - role.yaml
# - rolebinding.yaml
# - sa.yaml
# - subnet-router.yaml

0 comments on commit b5d17e0

Please sign in to comment.