diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3240a171bd8..a9044e5c3c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -30,10 +30,11 @@ jobs: uses: actions/checkout@v2 with: submodules: true - - name: Kubeval - uses: instrumenta/kubeval-action@master - with: - files: 'cluster/' + # TODO: enable with new dir stucture + # - name: Kubeval + # uses: instrumenta/kubeval-action@master + # with: + # files: 'cluster/' compliance: runs-on: ubuntu-latest steps: @@ -48,7 +49,7 @@ jobs: result=$(docker run --rm --workdir /github/workspace \ -v $(pwd):/github/workspace \ instrumenta/conftest:v0.18.2 \ - test -o table -p security-policies/policies/ --all-namespaces --combine cluster/ --no-color || exit 0) + test -o table -p security-policies/policies/ --all-namespaces --combine namespaces/ --no-color || exit 0) result="${result//'%'/'%25'}" result="${result//$'\n'/'%0A'}" result="${result//$'\r'/'%0D'}" @@ -61,7 +62,7 @@ jobs: result=$(docker run --rm --workdir /github/workspace \ -v $(pwd):/github/workspace \ instrumenta/conftest:v0.18.2 \ - test -o stdout -p security-policies/policies/ --all-namespaces cluster/ --no-color || exit 0) + test -o stdout -p security-policies/policies/ --all-namespaces namespaces/ --no-color || exit 0) result="${result//'%'/'%25'}" result="${result//$'\n'/'%0A'}" result="${result//$'\r'/'%0D'}" diff --git a/bootstrap/install.sh b/bootstrap/install.sh index d75bb1f1ab3..2e175cceb16 100755 --- a/bootstrap/install.sh +++ b/bootstrap/install.sh @@ -28,7 +28,8 @@ if [[ -f .secrets/git-crypt/k8s-secret-sealed-secret-private-key.yaml ]]; then kubectl apply -f .secrets/git-crypt/k8s-secret-sealed-secret-private-key.yaml fi -if [[ -f cluster/flux-system/repo.yaml ]]; then +# TODO: add cluster ARG to script +if [[ -f clusters/production/repo.yaml ]]; then echo "Applying Repo Sync" - kubectl apply -f cluster/flux-system/repo.yaml + kubectl apply -f clusters/production/repo.yaml fi diff --git a/bootstrap/renovate-helm-releases.sh b/bootstrap/renovate-helm-releases.sh index 09e90f9df96..ef0bbff51af 100755 --- a/bootstrap/renovate-helm-releases.sh +++ b/bootstrap/renovate-helm-releases.sh @@ -6,8 +6,8 @@ shopt -s extglob # shellcheck disable=SC2155 REPO_ROOT=$(git rev-parse --show-toplevel) -CLUSTER_ROOT="${REPO_ROOT}/cluster" -HELM_REPO_FILES=$(find "$CLUSTER_ROOT/flux-system/helm-chart-repositories" -name '*.yaml') +CLUSTER_ROOT="${REPO_ROOT}/namespaces" +HELM_REPO_FILES=$(find "$CLUSTER_ROOT/base/flux-system/helm-chart-repositories" -name '*.yaml') HELM_RELEASE_FILES=$(find "$CLUSTER_ROOT" -name '*.yaml') for HELM_REPO_FILE in $HELM_REPO_FILES; do diff --git a/bootstrap/update.sh b/bootstrap/update.sh index 835f2825e74..575af93002c 100755 --- a/bootstrap/update.sh +++ b/bootstrap/update.sh @@ -14,7 +14,7 @@ flux install \ --network-policy=false \ --arch=arm64 \ --log-level=info \ - --export > "./cluster/flux-system/toolkit-components.yaml" + --export > "./namespaces/base/flux-system/toolkit-components.yaml" # Uncomment for local useage # git add -A && git commit -sam "update toolkit version to latest" && git push diff --git a/clusters/production/repo.yaml b/clusters/production/repo.yaml new file mode 100644 index 00000000000..39637b37b3e --- /dev/null +++ b/clusters/production/repo.yaml @@ -0,0 +1,30 @@ +--- +apiVersion: source.toolkit.fluxcd.io/v1beta1 +kind: GitRepository +metadata: + name: k8s-gitops + namespace: flux-system +spec: + interval: 5m + ref: + branch: main + url: https://github.com/raspbernetes/k8s-gitops.git + ignore: | + # exclude all + /* + # include deploy dir + !/cluster/ + /cluster/**/*.md +--- +apiVersion: kustomize.toolkit.fluxcd.io/v1beta1 +kind: Kustomization +metadata: + name: k8s-gitops + namespace: flux-system +spec: + interval: 5m + path: './namespaces/production' + sourceRef: + kind: GitRepository + name: k8s-gitops + prune: true diff --git a/cluster/flux-system/repo.yaml b/clusters/staging/repo.yaml similarity index 94% rename from cluster/flux-system/repo.yaml rename to clusters/staging/repo.yaml index c3f4a3f46d9..561fe0a1cd2 100644 --- a/cluster/flux-system/repo.yaml +++ b/clusters/staging/repo.yaml @@ -23,7 +23,7 @@ metadata: namespace: flux-system spec: interval: 5m - path: './cluster/' + path: './namespaces/staging' sourceRef: kind: GitRepository name: k8s-gitops diff --git a/cluster/actions-runner-system/README.md b/namespaces/base/actions-runner-system/README.md similarity index 100% rename from cluster/actions-runner-system/README.md rename to namespaces/base/actions-runner-system/README.md diff --git a/cluster/actions-runner-system/actions-runner-controller.yaml b/namespaces/base/actions-runner-system/actions-runner-controller.yaml similarity index 100% rename from cluster/actions-runner-system/actions-runner-controller.yaml rename to namespaces/base/actions-runner-system/actions-runner-controller.yaml diff --git a/namespaces/base/actions-runner-system/kustomization.yaml b/namespaces/base/actions-runner-system/kustomization.yaml new file mode 100644 index 00000000000..217667789fd --- /dev/null +++ b/namespaces/base/actions-runner-system/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - actions-runner-controller.yaml + - runner.yaml + - secret.encrypted.yaml diff --git a/cluster/actions-runner-system/runner.yaml b/namespaces/base/actions-runner-system/runner.yaml similarity index 100% rename from cluster/actions-runner-system/runner.yaml rename to namespaces/base/actions-runner-system/runner.yaml diff --git a/cluster/actions-runner-system/secret.encrypted.yaml b/namespaces/base/actions-runner-system/secret.encrypted.yaml similarity index 100% rename from cluster/actions-runner-system/secret.encrypted.yaml rename to namespaces/base/actions-runner-system/secret.encrypted.yaml diff --git a/cluster/flux-system/README.md b/namespaces/base/flux-system/README.md similarity index 100% rename from cluster/flux-system/README.md rename to namespaces/base/flux-system/README.md diff --git a/cluster/flux-system/github-notifications/alerts.yaml b/namespaces/base/flux-system/github-notifications/alerts.yaml similarity index 100% rename from cluster/flux-system/github-notifications/alerts.yaml rename to namespaces/base/flux-system/github-notifications/alerts.yaml diff --git a/namespaces/base/flux-system/github-notifications/kustomization.yaml b/namespaces/base/flux-system/github-notifications/kustomization.yaml new file mode 100644 index 00000000000..b8ef3de4dd3 --- /dev/null +++ b/namespaces/base/flux-system/github-notifications/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - alerts.yaml + - provider.yaml + - secret.encrypted.yaml diff --git a/cluster/flux-system/github-notifications/provider.yaml b/namespaces/base/flux-system/github-notifications/provider.yaml similarity index 100% rename from cluster/flux-system/github-notifications/provider.yaml rename to namespaces/base/flux-system/github-notifications/provider.yaml diff --git a/cluster/flux-system/github-notifications/secret.encrypted.yaml b/namespaces/base/flux-system/github-notifications/secret.encrypted.yaml similarity index 100% rename from cluster/flux-system/github-notifications/secret.encrypted.yaml rename to namespaces/base/flux-system/github-notifications/secret.encrypted.yaml diff --git a/cluster/flux-system/helm-chart-repositories/banzaicloud-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/banzaicloud-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/banzaicloud-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/banzaicloud-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/bitnami-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/bitnami-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/bitnami-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/bitnami-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/coredns-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/coredns-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/coredns-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/coredns-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/flagger-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/flagger-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/flagger-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/flagger-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/gatekeeper-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/gatekeeper-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/gatekeeper-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/gatekeeper-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/grafana-loki.yaml b/namespaces/base/flux-system/helm-chart-repositories/grafana-loki.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/grafana-loki.yaml rename to namespaces/base/flux-system/helm-chart-repositories/grafana-loki.yaml diff --git a/cluster/flux-system/helm-chart-repositories/jetstack-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/jetstack-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/jetstack-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/jetstack-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/k8s-at-home-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/k8s-at-home-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/k8s-at-home-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/k8s-at-home-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/kubernetes-sigs-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/kubernetes-sigs-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/kubernetes-sigs-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/kubernetes-sigs-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/kubernetes-stable-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/kubernetes-stable-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/kubernetes-stable-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/kubernetes-stable-charts.yaml diff --git a/namespaces/base/flux-system/helm-chart-repositories/kustomization.yaml b/namespaces/base/flux-system/helm-chart-repositories/kustomization.yaml new file mode 100644 index 00000000000..fbf69688c16 --- /dev/null +++ b/namespaces/base/flux-system/helm-chart-repositories/kustomization.yaml @@ -0,0 +1,22 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - banzaicloud-charts.yaml + - bitnami-charts.yaml + - coredns-charts.yaml + - flagger-charts.yaml + - gatekeeper-charts.yaml + - grafana-loki.yaml + - jetstack-charts.yaml + - k8s-at-home-charts.yaml + - kubernetes-sigs-charts.yaml + - kubernetes-stable-charts.yaml + - litmuschaos-charts.yaml + - openebs-charts.yaml + - openebs-cstor-charts.yaml + - openfaas-charts.yaml + - prometheus-community-charts.yaml + - sealed-secrets-charts.yaml + - vernemq-charts.yaml + - vmware-charts.yaml + - weaveworks-kured-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/litmuschaos-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/litmuschaos-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/litmuschaos-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/litmuschaos-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/openebs-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/openebs-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/openebs-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/openebs-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/openebs-cstor-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/openebs-cstor-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/openebs-cstor-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/openebs-cstor-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/openfaas-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/openfaas-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/openfaas-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/openfaas-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/prometheus-community-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/prometheus-community-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/prometheus-community-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/prometheus-community-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/sealed-secrets-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/sealed-secrets-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/sealed-secrets-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/sealed-secrets-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/vernemq-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/vernemq-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/vernemq-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/vernemq-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/vmware-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/vmware-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/vmware-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/vmware-charts.yaml diff --git a/cluster/flux-system/helm-chart-repositories/weaveworks-kured-charts.yaml b/namespaces/base/flux-system/helm-chart-repositories/weaveworks-kured-charts.yaml similarity index 100% rename from cluster/flux-system/helm-chart-repositories/weaveworks-kured-charts.yaml rename to namespaces/base/flux-system/helm-chart-repositories/weaveworks-kured-charts.yaml diff --git a/namespaces/base/flux-system/kustomization.yaml b/namespaces/base/flux-system/kustomization.yaml new file mode 100644 index 00000000000..a4d2c54cc80 --- /dev/null +++ b/namespaces/base/flux-system/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - podmonitor.yaml + - toolkit-components.yaml + - webhook-receiver diff --git a/cluster/flux-system/podmonitor.yaml b/namespaces/base/flux-system/podmonitor.yaml similarity index 100% rename from cluster/flux-system/podmonitor.yaml rename to namespaces/base/flux-system/podmonitor.yaml diff --git a/cluster/flux-system/slack-notifications/alerts.yaml b/namespaces/base/flux-system/slack-notifications/alerts.yaml similarity index 100% rename from cluster/flux-system/slack-notifications/alerts.yaml rename to namespaces/base/flux-system/slack-notifications/alerts.yaml diff --git a/namespaces/base/flux-system/slack-notifications/kustomization.yaml b/namespaces/base/flux-system/slack-notifications/kustomization.yaml new file mode 100644 index 00000000000..b8ef3de4dd3 --- /dev/null +++ b/namespaces/base/flux-system/slack-notifications/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - alerts.yaml + - provider.yaml + - secret.encrypted.yaml diff --git a/cluster/flux-system/slack-notifications/provider.yaml b/namespaces/base/flux-system/slack-notifications/provider.yaml similarity index 100% rename from cluster/flux-system/slack-notifications/provider.yaml rename to namespaces/base/flux-system/slack-notifications/provider.yaml diff --git a/cluster/flux-system/slack-notifications/secret.encrypted.yaml b/namespaces/base/flux-system/slack-notifications/secret.encrypted.yaml similarity index 100% rename from cluster/flux-system/slack-notifications/secret.encrypted.yaml rename to namespaces/base/flux-system/slack-notifications/secret.encrypted.yaml diff --git a/cluster/flux-system/toolkit-components.yaml b/namespaces/base/flux-system/toolkit-components.yaml similarity index 100% rename from cluster/flux-system/toolkit-components.yaml rename to namespaces/base/flux-system/toolkit-components.yaml diff --git a/namespaces/base/flux-system/webhook-receiver/kustomization.yaml b/namespaces/base/flux-system/webhook-receiver/kustomization.yaml new file mode 100644 index 00000000000..c2a0967db49 --- /dev/null +++ b/namespaces/base/flux-system/webhook-receiver/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - receiver.yaml + - secret.encrypted.yaml + - virtualservice.yaml diff --git a/cluster/flux-system/webhook-receiver/receiver.yaml b/namespaces/base/flux-system/webhook-receiver/receiver.yaml similarity index 100% rename from cluster/flux-system/webhook-receiver/receiver.yaml rename to namespaces/base/flux-system/webhook-receiver/receiver.yaml diff --git a/cluster/flux-system/webhook-receiver/secret.encrypted.yaml b/namespaces/base/flux-system/webhook-receiver/secret.encrypted.yaml similarity index 100% rename from cluster/flux-system/webhook-receiver/secret.encrypted.yaml rename to namespaces/base/flux-system/webhook-receiver/secret.encrypted.yaml diff --git a/cluster/flux-system/webhook-receiver/virtualservice.yaml b/namespaces/base/flux-system/webhook-receiver/virtualservice.yaml similarity index 100% rename from cluster/flux-system/webhook-receiver/virtualservice.yaml rename to namespaces/base/flux-system/webhook-receiver/virtualservice.yaml diff --git a/cluster/home-system/home-assistant/home-assistant.yaml b/namespaces/base/home-system/home-assistant/helmrelease.yaml similarity index 100% rename from cluster/home-system/home-assistant/home-assistant.yaml rename to namespaces/base/home-system/home-assistant/helmrelease.yaml diff --git a/namespaces/base/home-system/home-assistant/kustomization.yaml b/namespaces/base/home-system/home-assistant/kustomization.yaml new file mode 100644 index 00000000000..285e2c02c3f --- /dev/null +++ b/namespaces/base/home-system/home-assistant/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - virtualservice.yaml diff --git a/cluster/home-system/home-assistant/virtualservice.yaml b/namespaces/base/home-system/home-assistant/virtualservice.yaml similarity index 100% rename from cluster/home-system/home-assistant/virtualservice.yaml rename to namespaces/base/home-system/home-assistant/virtualservice.yaml diff --git a/namespaces/base/home-system/kustomization.yaml b/namespaces/base/home-system/kustomization.yaml new file mode 100644 index 00000000000..38a83b8ad6b --- /dev/null +++ b/namespaces/base/home-system/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml diff --git a/cluster/home-system/mosquitto/mosquitto.yaml b/namespaces/base/home-system/mosquitto/helmrelease.yaml similarity index 100% rename from cluster/home-system/mosquitto/mosquitto.yaml rename to namespaces/base/home-system/mosquitto/helmrelease.yaml diff --git a/namespaces/base/home-system/mosquitto/kustomization.yaml b/namespaces/base/home-system/mosquitto/kustomization.yaml new file mode 100644 index 00000000000..4fd939d4470 --- /dev/null +++ b/namespaces/base/home-system/mosquitto/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml diff --git a/cluster/home-system/namespace.yaml b/namespaces/base/home-system/namespace.yaml similarity index 100% rename from cluster/home-system/namespace.yaml rename to namespaces/base/home-system/namespace.yaml diff --git a/cluster/home-system/networkpolicy.yaml b/namespaces/base/home-system/networkpolicy.yaml similarity index 100% rename from cluster/home-system/networkpolicy.yaml rename to namespaces/base/home-system/networkpolicy.yaml diff --git a/cluster/home-system/zigbee2mqtt/zigbee2mqtt.yaml b/namespaces/base/home-system/zigbee2mqtt/helmrelease.yaml similarity index 100% rename from cluster/home-system/zigbee2mqtt/zigbee2mqtt.yaml rename to namespaces/base/home-system/zigbee2mqtt/helmrelease.yaml diff --git a/namespaces/base/home-system/zigbee2mqtt/kustomization.yaml b/namespaces/base/home-system/zigbee2mqtt/kustomization.yaml new file mode 100644 index 00000000000..285e2c02c3f --- /dev/null +++ b/namespaces/base/home-system/zigbee2mqtt/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - virtualservice.yaml diff --git a/cluster/home-system/zigbee2mqtt/virtualservice.yaml b/namespaces/base/home-system/zigbee2mqtt/virtualservice.yaml similarity index 100% rename from cluster/home-system/zigbee2mqtt/virtualservice.yaml rename to namespaces/base/home-system/zigbee2mqtt/virtualservice.yaml diff --git a/cluster/home-system/zigbee2mqtt/zigbee2mqtt-debug.yaml b/namespaces/base/home-system/zigbee2mqtt/zigbee2mqtt-debug.yaml similarity index 100% rename from cluster/home-system/zigbee2mqtt/zigbee2mqtt-debug.yaml rename to namespaces/base/home-system/zigbee2mqtt/zigbee2mqtt-debug.yaml diff --git a/namespaces/base/istio-operator/kustomization.yaml b/namespaces/base/istio-operator/kustomization.yaml new file mode 100644 index 00000000000..27924814e00 --- /dev/null +++ b/namespaces/base/istio-operator/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - operator.yaml diff --git a/cluster/istio-operator/operator.yaml b/namespaces/base/istio-operator/operator.yaml similarity index 100% rename from cluster/istio-operator/operator.yaml rename to namespaces/base/istio-operator/operator.yaml diff --git a/cluster/istio-system/README.md b/namespaces/base/istio-system/README.md similarity index 100% rename from cluster/istio-system/README.md rename to namespaces/base/istio-system/README.md diff --git a/cluster/istio-system/certificate.yaml b/namespaces/base/istio-system/certificate.yaml similarity index 100% rename from cluster/istio-system/certificate.yaml rename to namespaces/base/istio-system/certificate.yaml diff --git a/cluster/istio-system/envoyfilter-authn.yaml b/namespaces/base/istio-system/envoyfilter-authn.yaml similarity index 100% rename from cluster/istio-system/envoyfilter-authn.yaml rename to namespaces/base/istio-system/envoyfilter-authn.yaml diff --git a/cluster/istio-system/gateway.yaml b/namespaces/base/istio-system/gateway.yaml similarity index 100% rename from cluster/istio-system/gateway.yaml rename to namespaces/base/istio-system/gateway.yaml diff --git a/cluster/istio-system/istio/istio.yaml b/namespaces/base/istio-system/istio/istio.yaml similarity index 100% rename from cluster/istio-system/istio/istio.yaml rename to namespaces/base/istio-system/istio/istio.yaml diff --git a/namespaces/base/istio-system/istio/kustomization.yaml b/namespaces/base/istio-system/istio/kustomization.yaml new file mode 100644 index 00000000000..3f9cfa70151 --- /dev/null +++ b/namespaces/base/istio-system/istio/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - istio.yaml diff --git a/namespaces/base/istio-system/kustomization.yaml b/namespaces/base/istio-system/kustomization.yaml new file mode 100644 index 00000000000..04589ebeab1 --- /dev/null +++ b/namespaces/base/istio-system/kustomization.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - certificate.yaml + - envoyfilter-authn.yaml + - gateway.yaml + - namespace.yaml + - networkpolicy.yaml + - originissuer.yaml + - peerauthentication.yaml + - secret.encrypted.yaml + - serviceentry.yaml + - servicemonitor.yaml + - virtualservice.yaml diff --git a/cluster/istio-system/namespace.yaml b/namespaces/base/istio-system/namespace.yaml similarity index 100% rename from cluster/istio-system/namespace.yaml rename to namespaces/base/istio-system/namespace.yaml diff --git a/cluster/istio-system/networkpolicy.yaml b/namespaces/base/istio-system/networkpolicy.yaml similarity index 100% rename from cluster/istio-system/networkpolicy.yaml rename to namespaces/base/istio-system/networkpolicy.yaml diff --git a/cluster/istio-system/originissuer.yaml b/namespaces/base/istio-system/originissuer.yaml similarity index 100% rename from cluster/istio-system/originissuer.yaml rename to namespaces/base/istio-system/originissuer.yaml diff --git a/cluster/istio-system/peerauthentication.yaml b/namespaces/base/istio-system/peerauthentication.yaml similarity index 100% rename from cluster/istio-system/peerauthentication.yaml rename to namespaces/base/istio-system/peerauthentication.yaml diff --git a/cluster/istio-system/secret.encrypted.yaml b/namespaces/base/istio-system/secret.encrypted.yaml similarity index 100% rename from cluster/istio-system/secret.encrypted.yaml rename to namespaces/base/istio-system/secret.encrypted.yaml diff --git a/cluster/istio-system/serviceentry.yaml b/namespaces/base/istio-system/serviceentry.yaml similarity index 100% rename from cluster/istio-system/serviceentry.yaml rename to namespaces/base/istio-system/serviceentry.yaml diff --git a/cluster/istio-system/servicemonitor.yaml b/namespaces/base/istio-system/servicemonitor.yaml similarity index 100% rename from cluster/istio-system/servicemonitor.yaml rename to namespaces/base/istio-system/servicemonitor.yaml diff --git a/cluster/istio-system/virtualservice.yaml b/namespaces/base/istio-system/virtualservice.yaml similarity index 100% rename from cluster/istio-system/virtualservice.yaml rename to namespaces/base/istio-system/virtualservice.yaml diff --git a/namespaces/base/kube-system/cilium/kustomization.yaml b/namespaces/base/kube-system/cilium/kustomization.yaml new file mode 100644 index 00000000000..150de524cb0 --- /dev/null +++ b/namespaces/base/kube-system/cilium/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - service.yaml + - servicemonitor.yaml + - virtualservice.yaml diff --git a/cluster/kube-system/cilium/service.yaml b/namespaces/base/kube-system/cilium/service.yaml similarity index 100% rename from cluster/kube-system/cilium/service.yaml rename to namespaces/base/kube-system/cilium/service.yaml diff --git a/cluster/kube-system/cilium/servicemonitor.yaml b/namespaces/base/kube-system/cilium/servicemonitor.yaml similarity index 100% rename from cluster/kube-system/cilium/servicemonitor.yaml rename to namespaces/base/kube-system/cilium/servicemonitor.yaml diff --git a/cluster/kube-system/cilium/virtualservice.yaml b/namespaces/base/kube-system/cilium/virtualservice.yaml similarity index 100% rename from cluster/kube-system/cilium/virtualservice.yaml rename to namespaces/base/kube-system/cilium/virtualservice.yaml diff --git a/cluster/kube-system/descheduler/descheduler.yaml b/namespaces/base/kube-system/descheduler/helmrelease.yaml similarity index 100% rename from cluster/kube-system/descheduler/descheduler.yaml rename to namespaces/base/kube-system/descheduler/helmrelease.yaml diff --git a/namespaces/base/kube-system/descheduler/kustomization.yaml b/namespaces/base/kube-system/descheduler/kustomization.yaml new file mode 100644 index 00000000000..4fd939d4470 --- /dev/null +++ b/namespaces/base/kube-system/descheduler/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml diff --git a/cluster/kube-system/kured/kured.yaml b/namespaces/base/kube-system/kured/helmrelease.yaml similarity index 100% rename from cluster/kube-system/kured/kured.yaml rename to namespaces/base/kube-system/kured/helmrelease.yaml diff --git a/namespaces/base/kube-system/kured/kustomization.yaml b/namespaces/base/kube-system/kured/kustomization.yaml new file mode 100644 index 00000000000..bb16a039cc7 --- /dev/null +++ b/namespaces/base/kube-system/kured/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - servicemonitor.yaml diff --git a/cluster/kube-system/kured/servicemonitor.yaml b/namespaces/base/kube-system/kured/servicemonitor.yaml similarity index 100% rename from cluster/kube-system/kured/servicemonitor.yaml rename to namespaces/base/kube-system/kured/servicemonitor.yaml diff --git a/namespaces/base/kube-system/kustomization.yaml b/namespaces/base/kube-system/kustomization.yaml new file mode 100644 index 00000000000..38a83b8ad6b --- /dev/null +++ b/namespaces/base/kube-system/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml diff --git a/cluster/kube-system/metrics-server/metrics-server.yaml b/namespaces/base/kube-system/metrics-server/helmrelease.yaml similarity index 100% rename from cluster/kube-system/metrics-server/metrics-server.yaml rename to namespaces/base/kube-system/metrics-server/helmrelease.yaml diff --git a/namespaces/base/kube-system/metrics-server/kustomization.yaml b/namespaces/base/kube-system/metrics-server/kustomization.yaml new file mode 100644 index 00000000000..4fd939d4470 --- /dev/null +++ b/namespaces/base/kube-system/metrics-server/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml diff --git a/cluster/kube-system/namespace.yaml b/namespaces/base/kube-system/namespace.yaml similarity index 100% rename from cluster/kube-system/namespace.yaml rename to namespaces/base/kube-system/namespace.yaml diff --git a/cluster/kube-system/networkpolicy.yaml b/namespaces/base/kube-system/networkpolicy.yaml similarity index 100% rename from cluster/kube-system/networkpolicy.yaml rename to namespaces/base/kube-system/networkpolicy.yaml diff --git a/cluster/kube-system/sealed-secrets/sealed-secrets.yaml b/namespaces/base/kube-system/sealed-secrets/helmrelease.yaml similarity index 98% rename from cluster/kube-system/sealed-secrets/sealed-secrets.yaml rename to namespaces/base/kube-system/sealed-secrets/helmrelease.yaml index 958dd353b9c..eaa957ae9ee 100644 --- a/cluster/kube-system/sealed-secrets/sealed-secrets.yaml +++ b/namespaces/base/kube-system/sealed-secrets/helmrelease.yaml @@ -4,7 +4,6 @@ kind: HelmRelease metadata: name: sealed-secrets namespace: kube-system - creationTimestamp: null spec: interval: 5m chart: diff --git a/namespaces/base/kube-system/sealed-secrets/kustomization.yaml b/namespaces/base/kube-system/sealed-secrets/kustomization.yaml new file mode 100644 index 00000000000..18eeb9b0e51 --- /dev/null +++ b/namespaces/base/kube-system/sealed-secrets/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - servicemonitor.yaml + - virtualservice.yaml diff --git a/cluster/kube-system/sealed-secrets/servicemonitor.yaml b/namespaces/base/kube-system/sealed-secrets/servicemonitor.yaml similarity index 100% rename from cluster/kube-system/sealed-secrets/servicemonitor.yaml rename to namespaces/base/kube-system/sealed-secrets/servicemonitor.yaml diff --git a/cluster/kube-system/sealed-secrets/virtualservice.yaml b/namespaces/base/kube-system/sealed-secrets/virtualservice.yaml similarity index 100% rename from cluster/kube-system/sealed-secrets/virtualservice.yaml rename to namespaces/base/kube-system/sealed-secrets/virtualservice.yaml diff --git a/cluster/litmus/litmus/litmus.yaml b/namespaces/base/litmus/helmrelease.yaml similarity index 100% rename from cluster/litmus/litmus/litmus.yaml rename to namespaces/base/litmus/helmrelease.yaml diff --git a/namespaces/base/litmus/kustomization.yaml b/namespaces/base/litmus/kustomization.yaml new file mode 100644 index 00000000000..d8c3d1aa824 --- /dev/null +++ b/namespaces/base/litmus/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml + - helmrelease.yaml diff --git a/cluster/litmus/namespace.yaml b/namespaces/base/litmus/namespace.yaml similarity index 100% rename from cluster/litmus/namespace.yaml rename to namespaces/base/litmus/namespace.yaml diff --git a/cluster/litmus/networkpolicy.yaml b/namespaces/base/litmus/networkpolicy.yaml similarity index 100% rename from cluster/litmus/networkpolicy.yaml rename to namespaces/base/litmus/networkpolicy.yaml diff --git a/cluster/network/README.md b/namespaces/base/network/README.md similarity index 100% rename from cluster/network/README.md rename to namespaces/base/network/README.md diff --git a/cluster/network/cert-manager/clusterissuer-prod.yaml b/namespaces/base/network/cert-manager/clusterissuer-prod.yaml similarity index 100% rename from cluster/network/cert-manager/clusterissuer-prod.yaml rename to namespaces/base/network/cert-manager/clusterissuer-prod.yaml diff --git a/cluster/network/cert-manager/clusterissuer-stg.yaml b/namespaces/base/network/cert-manager/clusterissuer-stg.yaml similarity index 100% rename from cluster/network/cert-manager/clusterissuer-stg.yaml rename to namespaces/base/network/cert-manager/clusterissuer-stg.yaml diff --git a/cluster/network/cert-manager/cert-manager.yaml b/namespaces/base/network/cert-manager/helmrelease.yaml similarity index 100% rename from cluster/network/cert-manager/cert-manager.yaml rename to namespaces/base/network/cert-manager/helmrelease.yaml diff --git a/namespaces/base/network/cert-manager/kustomization.yaml b/namespaces/base/network/cert-manager/kustomization.yaml new file mode 100644 index 00000000000..a27cdc044c6 --- /dev/null +++ b/namespaces/base/network/cert-manager/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - servicemonitor.yaml + - secret.encrypted.yaml + - clusterissuer-prod.yaml + - clusterissuer-stg.yaml diff --git a/cluster/network/cert-manager/secret.encrypted.yaml b/namespaces/base/network/cert-manager/secret.encrypted.yaml similarity index 100% rename from cluster/network/cert-manager/secret.encrypted.yaml rename to namespaces/base/network/cert-manager/secret.encrypted.yaml diff --git a/cluster/network/cert-manager/servicemonitor.yaml b/namespaces/base/network/cert-manager/servicemonitor.yaml similarity index 100% rename from cluster/network/cert-manager/servicemonitor.yaml rename to namespaces/base/network/cert-manager/servicemonitor.yaml diff --git a/cluster/network/cloudflare-ddns/deployment.yaml b/namespaces/base/network/cloudflare-ddns/deployment.yaml similarity index 100% rename from cluster/network/cloudflare-ddns/deployment.yaml rename to namespaces/base/network/cloudflare-ddns/deployment.yaml diff --git a/namespaces/base/network/cloudflare-ddns/kustomization.yaml b/namespaces/base/network/cloudflare-ddns/kustomization.yaml new file mode 100644 index 00000000000..c7755ac3c6b --- /dev/null +++ b/namespaces/base/network/cloudflare-ddns/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - deployment.yaml + - secret.encrypted.yaml diff --git a/cluster/network/cloudflare-ddns/secret.encrypted.yaml b/namespaces/base/network/cloudflare-ddns/secret.encrypted.yaml similarity index 100% rename from cluster/network/cloudflare-ddns/secret.encrypted.yaml rename to namespaces/base/network/cloudflare-ddns/secret.encrypted.yaml diff --git a/cluster/network/coredns/coredns-debug.yaml b/namespaces/base/network/coredns/coredns-debug.yaml similarity index 100% rename from cluster/network/coredns/coredns-debug.yaml rename to namespaces/base/network/coredns/coredns-debug.yaml diff --git a/cluster/network/coredns/coredns.yaml b/namespaces/base/network/coredns/helmrelease.yaml similarity index 100% rename from cluster/network/coredns/coredns.yaml rename to namespaces/base/network/coredns/helmrelease.yaml diff --git a/namespaces/base/network/coredns/kustomization.yaml b/namespaces/base/network/coredns/kustomization.yaml new file mode 100644 index 00000000000..4fd939d4470 --- /dev/null +++ b/namespaces/base/network/coredns/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml diff --git a/cluster/network/dex/README.md b/namespaces/base/network/dex/README.md similarity index 100% rename from cluster/network/dex/README.md rename to namespaces/base/network/dex/README.md diff --git a/cluster/network/dex/dex.yaml b/namespaces/base/network/dex/helmrelease.yaml similarity index 100% rename from cluster/network/dex/dex.yaml rename to namespaces/base/network/dex/helmrelease.yaml diff --git a/namespaces/base/network/dex/kustomization.yaml b/namespaces/base/network/dex/kustomization.yaml new file mode 100644 index 00000000000..41a3a62d59c --- /dev/null +++ b/namespaces/base/network/dex/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - secret.encrypted.yaml + - virtualservice.yaml diff --git a/cluster/network/dex/secret.encrypted.yaml b/namespaces/base/network/dex/secret.encrypted.yaml similarity index 100% rename from cluster/network/dex/secret.encrypted.yaml rename to namespaces/base/network/dex/secret.encrypted.yaml diff --git a/cluster/network/dex/virtualservice.yaml b/namespaces/base/network/dex/virtualservice.yaml similarity index 100% rename from cluster/network/dex/virtualservice.yaml rename to namespaces/base/network/dex/virtualservice.yaml diff --git a/cluster/network/external-dns/external-dns.yaml b/namespaces/base/network/external-dns/helmrelease.yaml similarity index 100% rename from cluster/network/external-dns/external-dns.yaml rename to namespaces/base/network/external-dns/helmrelease.yaml diff --git a/namespaces/base/network/external-dns/kustomization.yaml b/namespaces/base/network/external-dns/kustomization.yaml new file mode 100644 index 00000000000..506f42b39c0 --- /dev/null +++ b/namespaces/base/network/external-dns/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - secret.encrypted.yaml + - servicemonitor.yaml diff --git a/cluster/network/external-dns/secret.encrypted.yaml b/namespaces/base/network/external-dns/secret.encrypted.yaml similarity index 100% rename from cluster/network/external-dns/secret.encrypted.yaml rename to namespaces/base/network/external-dns/secret.encrypted.yaml diff --git a/cluster/network/external-dns/servicemonitor.yaml b/namespaces/base/network/external-dns/servicemonitor.yaml similarity index 100% rename from cluster/network/external-dns/servicemonitor.yaml rename to namespaces/base/network/external-dns/servicemonitor.yaml diff --git a/namespaces/base/network/kustomization.yaml b/namespaces/base/network/kustomization.yaml new file mode 100644 index 00000000000..38a83b8ad6b --- /dev/null +++ b/namespaces/base/network/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml diff --git a/cluster/network/metallb/metallb.yaml b/namespaces/base/network/metallb/helmrelease.yaml similarity index 100% rename from cluster/network/metallb/metallb.yaml rename to namespaces/base/network/metallb/helmrelease.yaml diff --git a/namespaces/base/network/metallb/kustomization.yaml b/namespaces/base/network/metallb/kustomization.yaml new file mode 100644 index 00000000000..4fd939d4470 --- /dev/null +++ b/namespaces/base/network/metallb/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml diff --git a/cluster/network/namespace.yaml b/namespaces/base/network/namespace.yaml similarity index 100% rename from cluster/network/namespace.yaml rename to namespaces/base/network/namespace.yaml diff --git a/cluster/network/networkpolicy.yaml b/namespaces/base/network/networkpolicy.yaml similarity index 100% rename from cluster/network/networkpolicy.yaml rename to namespaces/base/network/networkpolicy.yaml diff --git a/cluster/network/node-feature-discovery/node-feature-discovery.yaml b/namespaces/base/network/node-feature-discovery/helmrelease.yaml similarity index 100% rename from cluster/network/node-feature-discovery/node-feature-discovery.yaml rename to namespaces/base/network/node-feature-discovery/helmrelease.yaml diff --git a/namespaces/base/network/node-feature-discovery/kustomization.yaml b/namespaces/base/network/node-feature-discovery/kustomization.yaml new file mode 100644 index 00000000000..4fd939d4470 --- /dev/null +++ b/namespaces/base/network/node-feature-discovery/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml diff --git a/cluster/network/oauth2-proxy/oauth2-proxy.yaml b/namespaces/base/network/oauth2-proxy/helmrelease.yaml similarity index 100% rename from cluster/network/oauth2-proxy/oauth2-proxy.yaml rename to namespaces/base/network/oauth2-proxy/helmrelease.yaml diff --git a/namespaces/base/network/oauth2-proxy/kustomization.yaml b/namespaces/base/network/oauth2-proxy/kustomization.yaml new file mode 100644 index 00000000000..41a3a62d59c --- /dev/null +++ b/namespaces/base/network/oauth2-proxy/kustomization.yaml @@ -0,0 +1,6 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - secret.encrypted.yaml + - virtualservice.yaml diff --git a/cluster/network/oauth2-proxy/secret.encrypted.yaml b/namespaces/base/network/oauth2-proxy/secret.encrypted.yaml similarity index 100% rename from cluster/network/oauth2-proxy/secret.encrypted.yaml rename to namespaces/base/network/oauth2-proxy/secret.encrypted.yaml diff --git a/cluster/network/oauth2-proxy/virtualservice.yaml b/namespaces/base/network/oauth2-proxy/virtualservice.yaml similarity index 100% rename from cluster/network/oauth2-proxy/virtualservice.yaml rename to namespaces/base/network/oauth2-proxy/virtualservice.yaml diff --git a/cluster/network/origin-ca-issuer/README.md b/namespaces/base/network/origin-ca-issuer/README.md similarity index 100% rename from cluster/network/origin-ca-issuer/README.md rename to namespaces/base/network/origin-ca-issuer/README.md diff --git a/cluster/network/origin-ca-issuer/clusterrole.yaml b/namespaces/base/network/origin-ca-issuer/clusterrole.yaml similarity index 100% rename from cluster/network/origin-ca-issuer/clusterrole.yaml rename to namespaces/base/network/origin-ca-issuer/clusterrole.yaml diff --git a/cluster/network/origin-ca-issuer/clusterrolebinding.yaml b/namespaces/base/network/origin-ca-issuer/clusterrolebinding.yaml similarity index 100% rename from cluster/network/origin-ca-issuer/clusterrolebinding.yaml rename to namespaces/base/network/origin-ca-issuer/clusterrolebinding.yaml diff --git a/cluster/network/origin-ca-issuer/customresourcedefinition.yaml b/namespaces/base/network/origin-ca-issuer/customresourcedefinition.yaml similarity index 100% rename from cluster/network/origin-ca-issuer/customresourcedefinition.yaml rename to namespaces/base/network/origin-ca-issuer/customresourcedefinition.yaml diff --git a/cluster/network/origin-ca-issuer/deployment.yaml b/namespaces/base/network/origin-ca-issuer/deployment.yaml similarity index 100% rename from cluster/network/origin-ca-issuer/deployment.yaml rename to namespaces/base/network/origin-ca-issuer/deployment.yaml diff --git a/namespaces/base/network/origin-ca-issuer/kustomization.yaml b/namespaces/base/network/origin-ca-issuer/kustomization.yaml new file mode 100644 index 00000000000..7b01c848779 --- /dev/null +++ b/namespaces/base/network/origin-ca-issuer/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - deployment.yaml + - clusterrole.yaml + - clusterrolebinding.yaml + - customresourcedefinition.yaml + - serviceaccount.yaml diff --git a/cluster/network/origin-ca-issuer/serviceaccount.yaml b/namespaces/base/network/origin-ca-issuer/serviceaccount.yaml similarity index 100% rename from cluster/network/origin-ca-issuer/serviceaccount.yaml rename to namespaces/base/network/origin-ca-issuer/serviceaccount.yaml diff --git a/cluster/observability/README.md b/namespaces/base/observability/README.md similarity index 100% rename from cluster/observability/README.md rename to namespaces/base/observability/README.md diff --git a/cluster/observability/kiali/kiali-server.yaml b/namespaces/base/observability/kiali/helmrelease.yaml similarity index 100% rename from cluster/observability/kiali/kiali-server.yaml rename to namespaces/base/observability/kiali/helmrelease.yaml diff --git a/namespaces/base/observability/kiali/kustomization.yaml b/namespaces/base/observability/kiali/kustomization.yaml new file mode 100644 index 00000000000..285e2c02c3f --- /dev/null +++ b/namespaces/base/observability/kiali/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - virtualservice.yaml diff --git a/cluster/observability/kiali/virtualservice.yaml b/namespaces/base/observability/kiali/virtualservice.yaml similarity index 100% rename from cluster/observability/kiali/virtualservice.yaml rename to namespaces/base/observability/kiali/virtualservice.yaml diff --git a/cluster/observability/kube-prometheus-stack/kube-prometheus-stack.yaml b/namespaces/base/observability/kube-prometheus-stack/helmrelease.yaml similarity index 100% rename from cluster/observability/kube-prometheus-stack/kube-prometheus-stack.yaml rename to namespaces/base/observability/kube-prometheus-stack/helmrelease.yaml diff --git a/namespaces/base/observability/kube-prometheus-stack/kustomization.yaml b/namespaces/base/observability/kube-prometheus-stack/kustomization.yaml new file mode 100644 index 00000000000..7a88c0d5263 --- /dev/null +++ b/namespaces/base/observability/kube-prometheus-stack/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - secret.encrypted.yaml + - secret.encrypted-grafana.yaml + - secret.oauth2.encrypted.yaml + - virtualservice.yaml diff --git a/cluster/observability/kube-prometheus-stack/secret.encrypted-grafana.yaml b/namespaces/base/observability/kube-prometheus-stack/secret.encrypted-grafana.yaml similarity index 100% rename from cluster/observability/kube-prometheus-stack/secret.encrypted-grafana.yaml rename to namespaces/base/observability/kube-prometheus-stack/secret.encrypted-grafana.yaml diff --git a/cluster/observability/kube-prometheus-stack/secret.encrypted.yaml b/namespaces/base/observability/kube-prometheus-stack/secret.encrypted.yaml similarity index 100% rename from cluster/observability/kube-prometheus-stack/secret.encrypted.yaml rename to namespaces/base/observability/kube-prometheus-stack/secret.encrypted.yaml diff --git a/cluster/observability/kube-prometheus-stack/secret.oauth2.encrypted.yaml b/namespaces/base/observability/kube-prometheus-stack/secret.oauth2.encrypted.yaml similarity index 100% rename from cluster/observability/kube-prometheus-stack/secret.oauth2.encrypted.yaml rename to namespaces/base/observability/kube-prometheus-stack/secret.oauth2.encrypted.yaml diff --git a/cluster/observability/kube-prometheus-stack/virtualservice.yaml b/namespaces/base/observability/kube-prometheus-stack/virtualservice.yaml similarity index 100% rename from cluster/observability/kube-prometheus-stack/virtualservice.yaml rename to namespaces/base/observability/kube-prometheus-stack/virtualservice.yaml diff --git a/namespaces/base/observability/kustomization.yaml b/namespaces/base/observability/kustomization.yaml new file mode 100644 index 00000000000..38a83b8ad6b --- /dev/null +++ b/namespaces/base/observability/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml diff --git a/cluster/observability/loki-stack/loki-stack.yaml b/namespaces/base/observability/loki-stack/helmrelease.yaml similarity index 100% rename from cluster/observability/loki-stack/loki-stack.yaml rename to namespaces/base/observability/loki-stack/helmrelease.yaml diff --git a/namespaces/base/observability/loki-stack/kustomization.yaml b/namespaces/base/observability/loki-stack/kustomization.yaml new file mode 100644 index 00000000000..bb16a039cc7 --- /dev/null +++ b/namespaces/base/observability/loki-stack/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - servicemonitor.yaml diff --git a/cluster/observability/loki-stack/servicemonitor.yaml b/namespaces/base/observability/loki-stack/servicemonitor.yaml similarity index 100% rename from cluster/observability/loki-stack/servicemonitor.yaml rename to namespaces/base/observability/loki-stack/servicemonitor.yaml diff --git a/cluster/observability/namespace.yaml b/namespaces/base/observability/namespace.yaml similarity index 100% rename from cluster/observability/namespace.yaml rename to namespaces/base/observability/namespace.yaml diff --git a/cluster/observability/networkpolicy.yaml b/namespaces/base/observability/networkpolicy.yaml similarity index 100% rename from cluster/observability/networkpolicy.yaml rename to namespaces/base/observability/networkpolicy.yaml diff --git a/cluster/observability/speedtest/speedtest.yaml b/namespaces/base/observability/speedtest/helmrelease.yaml similarity index 100% rename from cluster/observability/speedtest/speedtest.yaml rename to namespaces/base/observability/speedtest/helmrelease.yaml diff --git a/namespaces/base/observability/speedtest/kustomization.yaml b/namespaces/base/observability/speedtest/kustomization.yaml new file mode 100644 index 00000000000..bb16a039cc7 --- /dev/null +++ b/namespaces/base/observability/speedtest/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - servicemonitor.yaml diff --git a/cluster/observability/speedtest/servicemonitor.yaml b/namespaces/base/observability/speedtest/servicemonitor.yaml similarity index 100% rename from cluster/observability/speedtest/servicemonitor.yaml rename to namespaces/base/observability/speedtest/servicemonitor.yaml diff --git a/cluster/observability/thanos/thanos.yaml b/namespaces/base/observability/thanos/helmrelease.yaml similarity index 100% rename from cluster/observability/thanos/thanos.yaml rename to namespaces/base/observability/thanos/helmrelease.yaml diff --git a/namespaces/base/observability/thanos/kustomization.yaml b/namespaces/base/observability/thanos/kustomization.yaml new file mode 100644 index 00000000000..c0b1129d6fd --- /dev/null +++ b/namespaces/base/observability/thanos/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - secret.encrypted.yaml + - servicemonitor.yaml + - virtualservice.yaml diff --git a/cluster/observability/thanos/secret.encrypted.yaml b/namespaces/base/observability/thanos/secret.encrypted.yaml similarity index 100% rename from cluster/observability/thanos/secret.encrypted.yaml rename to namespaces/base/observability/thanos/secret.encrypted.yaml diff --git a/cluster/observability/thanos/servicemonitor.yaml b/namespaces/base/observability/thanos/servicemonitor.yaml similarity index 100% rename from cluster/observability/thanos/servicemonitor.yaml rename to namespaces/base/observability/thanos/servicemonitor.yaml diff --git a/cluster/observability/thanos/virtualservice.yaml b/namespaces/base/observability/thanos/virtualservice.yaml similarity index 100% rename from cluster/observability/thanos/virtualservice.yaml rename to namespaces/base/observability/thanos/virtualservice.yaml diff --git a/namespaces/base/openfaas-fn/kustomization.yaml b/namespaces/base/openfaas-fn/kustomization.yaml new file mode 100644 index 00000000000..38a83b8ad6b --- /dev/null +++ b/namespaces/base/openfaas-fn/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml diff --git a/cluster/openfaas-fn/namespace.yaml b/namespaces/base/openfaas-fn/namespace.yaml similarity index 100% rename from cluster/openfaas-fn/namespace.yaml rename to namespaces/base/openfaas-fn/namespace.yaml diff --git a/cluster/openfaas-fn/networkpolicy.yaml b/namespaces/base/openfaas-fn/networkpolicy.yaml similarity index 100% rename from cluster/openfaas-fn/networkpolicy.yaml rename to namespaces/base/openfaas-fn/networkpolicy.yaml diff --git a/cluster/openfaas/README.md b/namespaces/base/openfaas/README.md similarity index 100% rename from cluster/openfaas/README.md rename to namespaces/base/openfaas/README.md diff --git a/namespaces/base/openfaas/kustomization.yaml b/namespaces/base/openfaas/kustomization.yaml new file mode 100644 index 00000000000..38a83b8ad6b --- /dev/null +++ b/namespaces/base/openfaas/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml diff --git a/cluster/openfaas/namespace.yaml b/namespaces/base/openfaas/namespace.yaml similarity index 100% rename from cluster/openfaas/namespace.yaml rename to namespaces/base/openfaas/namespace.yaml diff --git a/cluster/openfaas/networkpolicy.yaml b/namespaces/base/openfaas/networkpolicy.yaml similarity index 100% rename from cluster/openfaas/networkpolicy.yaml rename to namespaces/base/openfaas/networkpolicy.yaml diff --git a/cluster/openfaas/openfaas/openfaas.yaml b/namespaces/base/openfaas/openfaas/helmrelease.yaml similarity index 100% rename from cluster/openfaas/openfaas/openfaas.yaml rename to namespaces/base/openfaas/openfaas/helmrelease.yaml diff --git a/namespaces/base/openfaas/openfaas/kustomization.yaml b/namespaces/base/openfaas/openfaas/kustomization.yaml new file mode 100644 index 00000000000..4fd939d4470 --- /dev/null +++ b/namespaces/base/openfaas/openfaas/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml diff --git a/cluster/security/README.md b/namespaces/base/security/README.md similarity index 100% rename from cluster/security/README.md rename to namespaces/base/security/README.md diff --git a/cluster/security/gatekeeper/gatekeeper.yaml b/namespaces/base/security/gatekeeper/helmrelease.yaml similarity index 100% rename from cluster/security/gatekeeper/gatekeeper.yaml rename to namespaces/base/security/gatekeeper/helmrelease.yaml diff --git a/namespaces/base/security/gatekeeper/kustomization.yaml b/namespaces/base/security/gatekeeper/kustomization.yaml new file mode 100644 index 00000000000..0f600cba756 --- /dev/null +++ b/namespaces/base/security/gatekeeper/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - helmrelease.yaml + - podmonitor.yaml diff --git a/cluster/security/gatekeeper/podmonitor.yaml b/namespaces/base/security/gatekeeper/podmonitor.yaml similarity index 100% rename from cluster/security/gatekeeper/podmonitor.yaml rename to namespaces/base/security/gatekeeper/podmonitor.yaml diff --git a/namespaces/base/security/kustomization.yaml b/namespaces/base/security/kustomization.yaml new file mode 100644 index 00000000000..38a83b8ad6b --- /dev/null +++ b/namespaces/base/security/kustomization.yaml @@ -0,0 +1,5 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml diff --git a/cluster/security/namespace.yaml b/namespaces/base/security/namespace.yaml similarity index 100% rename from cluster/security/namespace.yaml rename to namespaces/base/security/namespace.yaml diff --git a/cluster/security/networkpolicy.yaml b/namespaces/base/security/networkpolicy.yaml similarity index 100% rename from cluster/security/networkpolicy.yaml rename to namespaces/base/security/networkpolicy.yaml diff --git a/cluster/storage/openebs/README.md b/namespaces/base/storage/openebs/README.md similarity index 100% rename from cluster/storage/openebs/README.md rename to namespaces/base/storage/openebs/README.md diff --git a/cluster/storage/openebs/cstor-pool.yaml b/namespaces/base/storage/openebs/cstor-pool.yaml similarity index 100% rename from cluster/storage/openebs/cstor-pool.yaml rename to namespaces/base/storage/openebs/cstor-pool.yaml diff --git a/cluster/storage/openebs/cstor.yaml b/namespaces/base/storage/openebs/helmrelease.yaml similarity index 100% rename from cluster/storage/openebs/cstor.yaml rename to namespaces/base/storage/openebs/helmrelease.yaml diff --git a/namespaces/base/storage/openebs/kustomization.yaml b/namespaces/base/storage/openebs/kustomization.yaml new file mode 100644 index 00000000000..9982d473284 --- /dev/null +++ b/namespaces/base/storage/openebs/kustomization.yaml @@ -0,0 +1,9 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml + - helmrelease.yaml + - servicemonitor.yaml + - storageclass.yaml + - cstor-pool.yaml diff --git a/cluster/storage/openebs/namespace.yaml b/namespaces/base/storage/openebs/namespace.yaml similarity index 100% rename from cluster/storage/openebs/namespace.yaml rename to namespaces/base/storage/openebs/namespace.yaml diff --git a/cluster/storage/openebs/networkpolicy.yaml b/namespaces/base/storage/openebs/networkpolicy.yaml similarity index 100% rename from cluster/storage/openebs/networkpolicy.yaml rename to namespaces/base/storage/openebs/networkpolicy.yaml diff --git a/cluster/storage/openebs/servicemonitor.yaml b/namespaces/base/storage/openebs/servicemonitor.yaml similarity index 100% rename from cluster/storage/openebs/servicemonitor.yaml rename to namespaces/base/storage/openebs/servicemonitor.yaml diff --git a/cluster/storage/openebs/storageclass.yaml b/namespaces/base/storage/openebs/storageclass.yaml similarity index 100% rename from cluster/storage/openebs/storageclass.yaml rename to namespaces/base/storage/openebs/storageclass.yaml diff --git a/cluster/velero/velero.yaml b/namespaces/base/velero/helmrelease.yaml similarity index 99% rename from cluster/velero/velero.yaml rename to namespaces/base/velero/helmrelease.yaml index a11732cc150..54b7699a78d 100644 --- a/cluster/velero/velero.yaml +++ b/namespaces/base/velero/helmrelease.yaml @@ -71,10 +71,9 @@ spec: provider: openebs.io/cstor-blockstore name: default config: - prefix: cstor bucket: raspbernetes-openebs-backups + prefix: cstor namespace: openebs - backupPathPrefix: newbackup provider: gcp # Settings for Velero's prometheus metrics. Enabled by default. metrics: diff --git a/namespaces/base/velero/kustomization.yaml b/namespaces/base/velero/kustomization.yaml new file mode 100644 index 00000000000..da0773e2ea5 --- /dev/null +++ b/namespaces/base/velero/kustomization.yaml @@ -0,0 +1,8 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - namespace.yaml + - networkpolicy.yaml + - helmrelease.yaml + - secret.encrypted.yaml + - servicemonitor.yaml diff --git a/cluster/velero/namespace.yaml b/namespaces/base/velero/namespace.yaml similarity index 100% rename from cluster/velero/namespace.yaml rename to namespaces/base/velero/namespace.yaml diff --git a/cluster/velero/networkpolicy.yaml b/namespaces/base/velero/networkpolicy.yaml similarity index 100% rename from cluster/velero/networkpolicy.yaml rename to namespaces/base/velero/networkpolicy.yaml diff --git a/cluster/velero/secret.encrypted.yaml b/namespaces/base/velero/secret.encrypted.yaml similarity index 100% rename from cluster/velero/secret.encrypted.yaml rename to namespaces/base/velero/secret.encrypted.yaml diff --git a/cluster/velero/servicemonitor.yaml b/namespaces/base/velero/servicemonitor.yaml similarity index 100% rename from cluster/velero/servicemonitor.yaml rename to namespaces/base/velero/servicemonitor.yaml diff --git a/namespaces/production/kustomization.yaml b/namespaces/production/kustomization.yaml new file mode 100644 index 00000000000..e44954174c2 --- /dev/null +++ b/namespaces/production/kustomization.yaml @@ -0,0 +1,41 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/actions-runner-system + - ../base/flux-system + - ../base/home-system + - ../base/home-system/home-assistant + - ../base/home-system/mosquitto + - ../base/home-system/zigbee2mqtt + - ../base/istio-operator + - ../base/istio-system + - ../base/istio-system/istio + - ../base/kube-system + - ../base/kube-system/cilium + - ../base/kube-system/descheduler + - ../base/kube-system/kured + - ../base/kube-system/metrics-server + - ../base/kube-system/sealed-secrets + - ../base/litmus + - ../base/network + - ../base/network/cert-manager + - ../base/network/cloudflare-ddns + - ../base/network/coredns + - ../base/network/dex + - ../base/network/external-dns + - ../base/network/metallb + - ../base/network/node-feature-discovery + - ../base/network/oauth2-proxy + - ../base/network/origin-ca-issuer + - ../base/observability + - ../base/observability/kiali + - ../base/observability/kube-prometheus-stack + - ../base/observability/loki-stack + - ../base/observability/speedtest + - ../base/observability/thanos + - ../base/security + - ../base/security/gatekeeper + - ../base/storage/openebs + - ../base/velero +# patchesStrategicMerge: +# - patch.yaml diff --git a/namespaces/production/patch.yaml b/namespaces/production/patch.yaml new file mode 100644 index 00000000000..e69de29bb2d diff --git a/namespaces/staging/kustomization.yaml b/namespaces/staging/kustomization.yaml new file mode 100644 index 00000000000..e44954174c2 --- /dev/null +++ b/namespaces/staging/kustomization.yaml @@ -0,0 +1,41 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - ../base/actions-runner-system + - ../base/flux-system + - ../base/home-system + - ../base/home-system/home-assistant + - ../base/home-system/mosquitto + - ../base/home-system/zigbee2mqtt + - ../base/istio-operator + - ../base/istio-system + - ../base/istio-system/istio + - ../base/kube-system + - ../base/kube-system/cilium + - ../base/kube-system/descheduler + - ../base/kube-system/kured + - ../base/kube-system/metrics-server + - ../base/kube-system/sealed-secrets + - ../base/litmus + - ../base/network + - ../base/network/cert-manager + - ../base/network/cloudflare-ddns + - ../base/network/coredns + - ../base/network/dex + - ../base/network/external-dns + - ../base/network/metallb + - ../base/network/node-feature-discovery + - ../base/network/oauth2-proxy + - ../base/network/origin-ca-issuer + - ../base/observability + - ../base/observability/kiali + - ../base/observability/kube-prometheus-stack + - ../base/observability/loki-stack + - ../base/observability/speedtest + - ../base/observability/thanos + - ../base/security + - ../base/security/gatekeeper + - ../base/storage/openebs + - ../base/velero +# patchesStrategicMerge: +# - patch.yaml diff --git a/namespaces/staging/patch.yaml b/namespaces/staging/patch.yaml new file mode 100644 index 00000000000..e69de29bb2d