From 6b0510e8fc5dfffcfaf96285e52a77e2b68531b4 Mon Sep 17 00:00:00 2001 From: Massaki Archambault Date: Sat, 1 Aug 2020 21:49:55 -0400 Subject: [PATCH] reorganize kustomize --- Makefile | 37 ++++++++++++------- docker-compose.yml | 4 +- .../base/cert-manager/kustomization.yaml | 5 --- .../base/ingress-nginx/kustomization.yaml | 11 ------ ...inx-ingress-controller-nodeport-patch.yaml | 12 ------ ...ingress-controller-nodeselector-patch.yaml | 10 ----- .../base/nfs-provisionner/kustomization.yaml | 10 ----- .../nfs-provisionner-deployment-patch.yaml | 15 -------- .../nfs-provisionner-storageclass.yaml | 9 ----- .../nfs-provisionner/nfs-provisionner.yaml | 9 ----- .../cert-manager/cert-manager.yaml | 4 +- .../bases/cert-manager/kustomization.yaml | 2 + .../gitea/drone-runner-deployment.yaml | 0 .../gitea/drone-server-deployment.yaml | 0 .../gitea/gitea-deployment.yaml | 0 .../{base => bases}/gitea/kustomization.yaml | 8 +--- .../grafana/grafana-deployment.yaml | 0 .../grafana/kustomization.yaml | 11 +----- .../grafana/provision/datasources.yaml | 0 .../bases/ingress-nginx/kustomization.yaml | 2 + .../nginx-ingress-controller.yaml | 0 .../kubernetes-dashboard-admin-user.yaml | 0 .../kubernetes-dashboard-ingress.yaml | 0 .../kubernetes-dashboard.yaml | 0 .../kubernetes-dashboard/kustomization.yaml | 0 .../mariadb/kustomization.yaml | 0 .../mariadb/mariadb-statefulset.yaml | 0 .../kube-state-metrics-servicemonitors.yaml | 0 .../kube-state-metrics.yaml | 0 .../kube-state-metrics/kustomization.yaml | 0 .../monitoring/kustomization.yaml | 0 .../{base => bases}/monitoring/namespace.yaml | 0 .../node-exporter/kustomization.yaml | 0 .../node-exporter-daemonset.yaml | 0 .../prometheus-operator/kustomization.yaml | 0 .../prometheus-operator.yaml | 0 .../monitoring/prometheus/kustomization.yaml | 0 .../prometheus/prometheus-rbac.yaml | 0 .../monitoring/prometheus/prometheus.yaml | 0 .../prometheus/servicemonitors.yaml | 0 .../nextcloud/kustomization.yaml | 8 +--- .../nextcloud/nextcloud-cronjob.yaml | 0 .../nextcloud/nextcloud-deployment.yaml | 0 .../cert-manager/kustomization.yaml | 4 ++ kustomize/namespaces/gitea/kustomization.yaml | 8 ++++ .../{base => namespaces}/gitea/namespace.yaml | 0 .../namespaces/grafana/kustomization.yaml | 8 ++++ .../grafana/namespace.yaml | 0 .../ingress-nginx/kustomization.yaml | 4 ++ .../namespaces/nextcloud/kustomization.yaml | 8 ++++ .../nextcloud/namespace.yaml | 0 .../dev-base-deploy}/kustomization.yaml | 5 +-- .../dev/cert-manager/clusterissuer.yaml | 0 .../dev/cert-manager/kustomizeconfig.yaml | 0 .../dev/kustomization.yaml | 24 +++--------- .../dev/ssm-secrets.yaml | 0 .../prod/cert-manager/clusterissuer.yaml | 0 .../prod/cert-manager/kustomizeconfig.yaml | 0 58 files changed, 74 insertions(+), 144 deletions(-) delete mode 100644 kustomize/base/cert-manager/kustomization.yaml delete mode 100644 kustomize/base/ingress-nginx/kustomization.yaml delete mode 100644 kustomize/base/ingress-nginx/nginx-ingress-controller-nodeport-patch.yaml delete mode 100644 kustomize/base/ingress-nginx/nginx-ingress-controller-nodeselector-patch.yaml delete mode 100644 kustomize/base/nfs-provisionner/kustomization.yaml delete mode 100644 kustomize/base/nfs-provisionner/nfs-provisionner-deployment-patch.yaml delete mode 100644 kustomize/base/nfs-provisionner/nfs-provisionner-storageclass.yaml delete mode 100644 kustomize/base/nfs-provisionner/nfs-provisionner.yaml rename kustomize/{base => bases}/cert-manager/cert-manager.yaml (58%) create mode 100644 kustomize/bases/cert-manager/kustomization.yaml rename kustomize/{base => bases}/gitea/drone-runner-deployment.yaml (100%) rename kustomize/{base => bases}/gitea/drone-server-deployment.yaml (100%) rename kustomize/{base => bases}/gitea/gitea-deployment.yaml (100%) rename kustomize/{base => bases}/gitea/kustomization.yaml (87%) rename kustomize/{base => bases}/grafana/grafana-deployment.yaml (100%) rename kustomize/{base => bases}/grafana/kustomization.yaml (73%) rename kustomize/{base => bases}/grafana/provision/datasources.yaml (100%) create mode 100644 kustomize/bases/ingress-nginx/kustomization.yaml rename kustomize/{base => bases}/ingress-nginx/nginx-ingress-controller.yaml (100%) rename kustomize/{base => bases}/kubernetes-dashboard/kubernetes-dashboard-admin-user.yaml (100%) rename kustomize/{base => bases}/kubernetes-dashboard/kubernetes-dashboard-ingress.yaml (100%) rename kustomize/{base => bases}/kubernetes-dashboard/kubernetes-dashboard.yaml (100%) rename kustomize/{base => bases}/kubernetes-dashboard/kustomization.yaml (100%) rename kustomize/{base => bases}/mariadb/kustomization.yaml (100%) rename kustomize/{base => bases}/mariadb/mariadb-statefulset.yaml (100%) rename kustomize/{base => bases}/monitoring/kube-state-metrics/kube-state-metrics-servicemonitors.yaml (100%) rename kustomize/{base => bases}/monitoring/kube-state-metrics/kube-state-metrics.yaml (100%) rename kustomize/{base => bases}/monitoring/kube-state-metrics/kustomization.yaml (100%) rename kustomize/{base => bases}/monitoring/kustomization.yaml (100%) rename kustomize/{base => bases}/monitoring/namespace.yaml (100%) rename kustomize/{base => bases}/monitoring/node-exporter/kustomization.yaml (100%) rename kustomize/{base => bases}/monitoring/node-exporter/node-exporter-daemonset.yaml (100%) rename kustomize/{base => bases}/monitoring/prometheus-operator/kustomization.yaml (100%) rename kustomize/{base => bases}/monitoring/prometheus-operator/prometheus-operator.yaml (100%) rename kustomize/{base => bases}/monitoring/prometheus/kustomization.yaml (100%) rename kustomize/{base => bases}/monitoring/prometheus/prometheus-rbac.yaml (100%) rename kustomize/{base => bases}/monitoring/prometheus/prometheus.yaml (100%) rename kustomize/{base => bases}/monitoring/prometheus/servicemonitors.yaml (100%) rename kustomize/{base => bases}/nextcloud/kustomization.yaml (71%) rename kustomize/{base => bases}/nextcloud/nextcloud-cronjob.yaml (100%) rename kustomize/{base => bases}/nextcloud/nextcloud-deployment.yaml (100%) create mode 100644 kustomize/namespaces/cert-manager/kustomization.yaml create mode 100644 kustomize/namespaces/gitea/kustomization.yaml rename kustomize/{base => namespaces}/gitea/namespace.yaml (100%) create mode 100644 kustomize/namespaces/grafana/kustomization.yaml rename kustomize/{base => namespaces}/grafana/namespace.yaml (100%) create mode 100644 kustomize/namespaces/ingress-nginx/kustomization.yaml create mode 100644 kustomize/namespaces/nextcloud/kustomization.yaml rename kustomize/{base => namespaces}/nextcloud/namespace.yaml (100%) rename kustomize/{environment/all => overlays/dev-base-deploy}/kustomization.yaml (51%) rename kustomize/{environment => overlays}/dev/cert-manager/clusterissuer.yaml (100%) rename kustomize/{environment => overlays}/dev/cert-manager/kustomizeconfig.yaml (100%) rename kustomize/{environment => overlays}/dev/kustomization.yaml (80%) rename kustomize/{environment => overlays}/dev/ssm-secrets.yaml (100%) rename kustomize/{environment => overlays}/prod/cert-manager/clusterissuer.yaml (100%) rename kustomize/{environment => overlays}/prod/cert-manager/kustomizeconfig.yaml (100%) diff --git a/Makefile b/Makefile index 72243ce..cffc851 100644 --- a/Makefile +++ b/Makefile @@ -9,25 +9,33 @@ KUBECTLAPPLYFLAGS = -l managed-by=kustomize --prune SRC := $(shell find kustomize/ -type f) OUTDIR = build -# all environments -KUSTOMIZEDIRALL = kustomize/environment/all -KUSTOMIZEOUTALL = $(OUTDIR)/all/manifest.yaml ifeq ($(environment),prod) + environment = prod + # prod - KUSTOMIZEDIR = kustomize/environment/prod - KUSTOMIZEOUT = $(OUTDIR)/prod/manifest.yaml + KUSTOMIZEDIR = kustomize/overlays/prod + KUSTOMIZEOUT = $(OUTDIR)/$(environment)/manifest.yaml + + # base-deploy + KUSTOMIZEDIRALL = kustomize/overlays/prod-base-deploy + KUSTOMIZEOUTALL = $(OUTDIR)/$(environment)/base-deploy.yaml else - # dev environment = dev - KUBECTLFLAGS += --kubeconfig kubectl/kubeconfig.yaml - KUSTOMIZEDIR = kustomize/environment/dev - KUSTOMIZEOUT = $(OUTDIR)/dev/manifest.yaml + + # dev + #KUBECTLFLAGS += --kubeconfig kubectl/kubeconfig.yaml + KUSTOMIZEDIR = kustomize/overlays/dev + KUSTOMIZEOUT = $(OUTDIR)/$(environment)/manifest.yaml + + # base-deploy + KUSTOMIZEDIRALL = kustomize/overlays/dev-base-deploy + KUSTOMIZEOUTALL = $(OUTDIR)/$(environment)/base-deploy.yaml endif -.PHONY: info clean diff apply +.PHONY: all info base-deploy clean diff apply -all: info $(KUSTOMIZEOUT) +all: info base-deploy $(KUSTOMIZEOUT) info: @echo "Building for" $(environment) @@ -35,10 +43,12 @@ info: clean: rm -r $(OUTDIR) -$(KUSTOMIZEOUT): $(SRC) +base-deploy: $(SRC) @mkdir -p $(dir $(KUSTOMIZEOUTALL)) - @mkdir -p $(dir $(KUSTOMIZEOUT)) $(KUSTOMIZE) build $(KUSTOMIZEFLAGS) $(KUSTOMIZEDIRALL) >$(KUSTOMIZEOUTALL) || (rm $(KUSTOMIZEOUTALL); exit 1) + +$(KUSTOMIZEOUT): $(SRC) + @mkdir -p $(dir $(KUSTOMIZEOUT)) $(KUSTOMIZE) build $(KUSTOMIZEFLAGS) $(KUSTOMIZEDIR) >$(KUSTOMIZEOUT) || (rm $(KUSTOMIZEOUT); exit 1) diff: $(KUSTOMIZEOUT) @@ -46,4 +56,3 @@ diff: $(KUSTOMIZEOUT) apply: $(KUSTOMIZEOUT) $(KUBECTL) $(KUBECTLFLAGS) apply $(KUBECTLAPPLYFLAGS) -f $(KUSTOMIZEOUT) - diff --git a/docker-compose.yml b/docker-compose.yml index ea144a4..4037d40 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -24,8 +24,8 @@ services: - manifests:/var/lib/rancher/k3s/server/manifests/manifests:ro - .:/host ports: - - 80:30080 - - 443:30443 + - 80:80 + - 443:443 - 6443:6443 agent: image: rancher/k3s diff --git a/kustomize/base/cert-manager/kustomization.yaml b/kustomize/base/cert-manager/kustomization.yaml deleted file mode 100644 index 418b788..0000000 --- a/kustomize/base/cert-manager/kustomization.yaml +++ /dev/null @@ -1,5 +0,0 @@ -generators: - - cert-manager.yaml - -commonlabels: - app: cert-manager \ No newline at end of file diff --git a/kustomize/base/ingress-nginx/kustomization.yaml b/kustomize/base/ingress-nginx/kustomization.yaml deleted file mode 100644 index e0fee8c..0000000 --- a/kustomize/base/ingress-nginx/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -generators: - - nginx-ingress-controller.yaml - -patchesStrategicMerge: - - nginx-ingress-controller-nodeselector-patch.yaml - - nginx-ingress-controller-nodeport-patch.yaml - -namespace: ingress-nginx - -commonlabels: - app: ingress-nginx \ No newline at end of file diff --git a/kustomize/base/ingress-nginx/nginx-ingress-controller-nodeport-patch.yaml b/kustomize/base/ingress-nginx/nginx-ingress-controller-nodeport-patch.yaml deleted file mode 100644 index aa3a880..0000000 --- a/kustomize/base/ingress-nginx/nginx-ingress-controller-nodeport-patch.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: ingress-nginx-controller - namespace: ingress-nginx -spec: - externalTrafficPolicy: Local - ports: - - port: 80 - nodePort: 30080 - - port: 443 - nodePort: 30443 \ No newline at end of file diff --git a/kustomize/base/ingress-nginx/nginx-ingress-controller-nodeselector-patch.yaml b/kustomize/base/ingress-nginx/nginx-ingress-controller-nodeselector-patch.yaml deleted file mode 100644 index 273f47e..0000000 --- a/kustomize/base/ingress-nginx/nginx-ingress-controller-nodeselector-patch.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ingress-nginx-controller - namespace: ingress-nginx -spec: - template: - spec: - nodeSelector: - node-role.kubernetes.io/master: "true" \ No newline at end of file diff --git a/kustomize/base/nfs-provisionner/kustomization.yaml b/kustomize/base/nfs-provisionner/kustomization.yaml deleted file mode 100644 index 50222fe..0000000 --- a/kustomize/base/nfs-provisionner/kustomization.yaml +++ /dev/null @@ -1,10 +0,0 @@ -resources: - - nfs-provisionner-storageclass.yaml - -generators: - - nfs-provisionner.yaml - -namespace: kube-system - -patchesStrategicMerge: - - nfs-provisionner-deployment-patch.yaml \ No newline at end of file diff --git a/kustomize/base/nfs-provisionner/nfs-provisionner-deployment-patch.yaml b/kustomize/base/nfs-provisionner/nfs-provisionner-deployment-patch.yaml deleted file mode 100644 index ec18d2f..0000000 --- a/kustomize/base/nfs-provisionner/nfs-provisionner-deployment-patch.yaml +++ /dev/null @@ -1,15 +0,0 @@ -kind: Deployment -apiVersion: apps/v1 -metadata: - name: nfs-provisioner -spec: - template: - spec: - containers: - - name: nfs-provisioner - args: - - "-provisioner=badjware.dev/nfs" - volumes: - - name: export-volume - hostPath: - path: /srv/nfs \ No newline at end of file diff --git a/kustomize/base/nfs-provisionner/nfs-provisionner-storageclass.yaml b/kustomize/base/nfs-provisionner/nfs-provisionner-storageclass.yaml deleted file mode 100644 index 4a771f6..0000000 --- a/kustomize/base/nfs-provisionner/nfs-provisionner-storageclass.yaml +++ /dev/null @@ -1,9 +0,0 @@ -kind: StorageClass -apiVersion: storage.k8s.io/v1 -metadata: - name: nfs - annotations: - storageclass.beta.kubernetes.io/is-default-class: "true" -provisioner: badjware.dev/nfs -mountOptions: - - vers=4.1 diff --git a/kustomize/base/nfs-provisionner/nfs-provisionner.yaml b/kustomize/base/nfs-provisionner/nfs-provisionner.yaml deleted file mode 100644 index 0ca82aa..0000000 --- a/kustomize/base/nfs-provisionner/nfs-provisionner.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: badjware/v1 -kind: RemoteResources -metadata: - name: nfs-provisionner -resources: - - url: https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs/deploy/kubernetes/deployment.yaml - sha256: fead9be4f0fd1b2e2f9780a47a6f2b3a7a552ea9d9e526654bb0ac1f263718ac - - url: https://raw.githubusercontent.com/kubernetes-incubator/external-storage/master/nfs/deploy/kubernetes/rbac.yaml - sha256: cb4075fac2084d477cb2384e39075217bf672627a3edb58c100307b500879846 \ No newline at end of file diff --git a/kustomize/base/cert-manager/cert-manager.yaml b/kustomize/bases/cert-manager/cert-manager.yaml similarity index 58% rename from kustomize/base/cert-manager/cert-manager.yaml rename to kustomize/bases/cert-manager/cert-manager.yaml index 1325871..fec7e58 100644 --- a/kustomize/base/cert-manager/cert-manager.yaml +++ b/kustomize/bases/cert-manager/cert-manager.yaml @@ -3,5 +3,5 @@ kind: RemoteResources metadata: name: cert-manager resources: - - url: https://github.com/jetstack/cert-manager/releases/download/v0.15.0/cert-manager.yaml - sha256: 255a558beaa4009f43aaf7f9aeadac9beca7b4e0d58c9c92cdf5aece3b3f2b2c \ No newline at end of file + - url: https://github.com/jetstack/cert-manager/releases/download/v0.16.0/cert-manager.yaml + sha256: 5770f5f01c10a902355b3522b8ce44508ebb6ec88955efde9a443afe5b3969d7 \ No newline at end of file diff --git a/kustomize/bases/cert-manager/kustomization.yaml b/kustomize/bases/cert-manager/kustomization.yaml new file mode 100644 index 0000000..e6297a1 --- /dev/null +++ b/kustomize/bases/cert-manager/kustomization.yaml @@ -0,0 +1,2 @@ +generators: + - cert-manager.yaml \ No newline at end of file diff --git a/kustomize/base/gitea/drone-runner-deployment.yaml b/kustomize/bases/gitea/drone-runner-deployment.yaml similarity index 100% rename from kustomize/base/gitea/drone-runner-deployment.yaml rename to kustomize/bases/gitea/drone-runner-deployment.yaml diff --git a/kustomize/base/gitea/drone-server-deployment.yaml b/kustomize/bases/gitea/drone-server-deployment.yaml similarity index 100% rename from kustomize/base/gitea/drone-server-deployment.yaml rename to kustomize/bases/gitea/drone-server-deployment.yaml diff --git a/kustomize/base/gitea/gitea-deployment.yaml b/kustomize/bases/gitea/gitea-deployment.yaml similarity index 100% rename from kustomize/base/gitea/gitea-deployment.yaml rename to kustomize/bases/gitea/gitea-deployment.yaml diff --git a/kustomize/base/gitea/kustomization.yaml b/kustomize/bases/gitea/kustomization.yaml similarity index 87% rename from kustomize/base/gitea/kustomization.yaml rename to kustomize/bases/gitea/kustomization.yaml index 2a83af0..5d0e8c0 100644 --- a/kustomize/base/gitea/kustomization.yaml +++ b/kustomize/bases/gitea/kustomization.yaml @@ -1,8 +1,4 @@ -bases: - - ../mariadb - resources: - - namespace.yaml - gitea-deployment.yaml - drone-server-deployment.yaml - drone-runner-deployment.yaml @@ -10,7 +6,7 @@ resources: secretGenerator: - name: mariadb-credentials-secret type: Opaque - behavior: replace + behavior: create literals: - database=gitea - username=gitea @@ -25,8 +21,6 @@ secretGenerator: - client_id=replaceme - client_secret=replaceme -namespace: gitea - vars: - name: GITEA_EXTERNAL_HOST objref: diff --git a/kustomize/base/grafana/grafana-deployment.yaml b/kustomize/bases/grafana/grafana-deployment.yaml similarity index 100% rename from kustomize/base/grafana/grafana-deployment.yaml rename to kustomize/bases/grafana/grafana-deployment.yaml diff --git a/kustomize/base/grafana/kustomization.yaml b/kustomize/bases/grafana/kustomization.yaml similarity index 73% rename from kustomize/base/grafana/kustomization.yaml rename to kustomize/bases/grafana/kustomization.yaml index 50c1459..b19d2af 100644 --- a/kustomize/base/grafana/kustomization.yaml +++ b/kustomize/bases/grafana/kustomization.yaml @@ -1,8 +1,4 @@ -bases: - - ../mariadb - resources: - - namespace.yaml - grafana-deployment.yaml configMapGenerator: @@ -13,13 +9,8 @@ configMapGenerator: secretGenerator: - name: mariadb-credentials-secret type: Opaque - behavior: replace + behavior: create literals: - database=grafana - username=grafana - password=replaceme - -namespace: grafana - -commonLabels: - app: grafana \ No newline at end of file diff --git a/kustomize/base/grafana/provision/datasources.yaml b/kustomize/bases/grafana/provision/datasources.yaml similarity index 100% rename from kustomize/base/grafana/provision/datasources.yaml rename to kustomize/bases/grafana/provision/datasources.yaml diff --git a/kustomize/bases/ingress-nginx/kustomization.yaml b/kustomize/bases/ingress-nginx/kustomization.yaml new file mode 100644 index 0000000..253012d --- /dev/null +++ b/kustomize/bases/ingress-nginx/kustomization.yaml @@ -0,0 +1,2 @@ +generators: + - nginx-ingress-controller.yaml diff --git a/kustomize/base/ingress-nginx/nginx-ingress-controller.yaml b/kustomize/bases/ingress-nginx/nginx-ingress-controller.yaml similarity index 100% rename from kustomize/base/ingress-nginx/nginx-ingress-controller.yaml rename to kustomize/bases/ingress-nginx/nginx-ingress-controller.yaml diff --git a/kustomize/base/kubernetes-dashboard/kubernetes-dashboard-admin-user.yaml b/kustomize/bases/kubernetes-dashboard/kubernetes-dashboard-admin-user.yaml similarity index 100% rename from kustomize/base/kubernetes-dashboard/kubernetes-dashboard-admin-user.yaml rename to kustomize/bases/kubernetes-dashboard/kubernetes-dashboard-admin-user.yaml diff --git a/kustomize/base/kubernetes-dashboard/kubernetes-dashboard-ingress.yaml b/kustomize/bases/kubernetes-dashboard/kubernetes-dashboard-ingress.yaml similarity index 100% rename from kustomize/base/kubernetes-dashboard/kubernetes-dashboard-ingress.yaml rename to kustomize/bases/kubernetes-dashboard/kubernetes-dashboard-ingress.yaml diff --git a/kustomize/base/kubernetes-dashboard/kubernetes-dashboard.yaml b/kustomize/bases/kubernetes-dashboard/kubernetes-dashboard.yaml similarity index 100% rename from kustomize/base/kubernetes-dashboard/kubernetes-dashboard.yaml rename to kustomize/bases/kubernetes-dashboard/kubernetes-dashboard.yaml diff --git a/kustomize/base/kubernetes-dashboard/kustomization.yaml b/kustomize/bases/kubernetes-dashboard/kustomization.yaml similarity index 100% rename from kustomize/base/kubernetes-dashboard/kustomization.yaml rename to kustomize/bases/kubernetes-dashboard/kustomization.yaml diff --git a/kustomize/base/mariadb/kustomization.yaml b/kustomize/bases/mariadb/kustomization.yaml similarity index 100% rename from kustomize/base/mariadb/kustomization.yaml rename to kustomize/bases/mariadb/kustomization.yaml diff --git a/kustomize/base/mariadb/mariadb-statefulset.yaml b/kustomize/bases/mariadb/mariadb-statefulset.yaml similarity index 100% rename from kustomize/base/mariadb/mariadb-statefulset.yaml rename to kustomize/bases/mariadb/mariadb-statefulset.yaml diff --git a/kustomize/base/monitoring/kube-state-metrics/kube-state-metrics-servicemonitors.yaml b/kustomize/bases/monitoring/kube-state-metrics/kube-state-metrics-servicemonitors.yaml similarity index 100% rename from kustomize/base/monitoring/kube-state-metrics/kube-state-metrics-servicemonitors.yaml rename to kustomize/bases/monitoring/kube-state-metrics/kube-state-metrics-servicemonitors.yaml diff --git a/kustomize/base/monitoring/kube-state-metrics/kube-state-metrics.yaml b/kustomize/bases/monitoring/kube-state-metrics/kube-state-metrics.yaml similarity index 100% rename from kustomize/base/monitoring/kube-state-metrics/kube-state-metrics.yaml rename to kustomize/bases/monitoring/kube-state-metrics/kube-state-metrics.yaml diff --git a/kustomize/base/monitoring/kube-state-metrics/kustomization.yaml b/kustomize/bases/monitoring/kube-state-metrics/kustomization.yaml similarity index 100% rename from kustomize/base/monitoring/kube-state-metrics/kustomization.yaml rename to kustomize/bases/monitoring/kube-state-metrics/kustomization.yaml diff --git a/kustomize/base/monitoring/kustomization.yaml b/kustomize/bases/monitoring/kustomization.yaml similarity index 100% rename from kustomize/base/monitoring/kustomization.yaml rename to kustomize/bases/monitoring/kustomization.yaml diff --git a/kustomize/base/monitoring/namespace.yaml b/kustomize/bases/monitoring/namespace.yaml similarity index 100% rename from kustomize/base/monitoring/namespace.yaml rename to kustomize/bases/monitoring/namespace.yaml diff --git a/kustomize/base/monitoring/node-exporter/kustomization.yaml b/kustomize/bases/monitoring/node-exporter/kustomization.yaml similarity index 100% rename from kustomize/base/monitoring/node-exporter/kustomization.yaml rename to kustomize/bases/monitoring/node-exporter/kustomization.yaml diff --git a/kustomize/base/monitoring/node-exporter/node-exporter-daemonset.yaml b/kustomize/bases/monitoring/node-exporter/node-exporter-daemonset.yaml similarity index 100% rename from kustomize/base/monitoring/node-exporter/node-exporter-daemonset.yaml rename to kustomize/bases/monitoring/node-exporter/node-exporter-daemonset.yaml diff --git a/kustomize/base/monitoring/prometheus-operator/kustomization.yaml b/kustomize/bases/monitoring/prometheus-operator/kustomization.yaml similarity index 100% rename from kustomize/base/monitoring/prometheus-operator/kustomization.yaml rename to kustomize/bases/monitoring/prometheus-operator/kustomization.yaml diff --git a/kustomize/base/monitoring/prometheus-operator/prometheus-operator.yaml b/kustomize/bases/monitoring/prometheus-operator/prometheus-operator.yaml similarity index 100% rename from kustomize/base/monitoring/prometheus-operator/prometheus-operator.yaml rename to kustomize/bases/monitoring/prometheus-operator/prometheus-operator.yaml diff --git a/kustomize/base/monitoring/prometheus/kustomization.yaml b/kustomize/bases/monitoring/prometheus/kustomization.yaml similarity index 100% rename from kustomize/base/monitoring/prometheus/kustomization.yaml rename to kustomize/bases/monitoring/prometheus/kustomization.yaml diff --git a/kustomize/base/monitoring/prometheus/prometheus-rbac.yaml b/kustomize/bases/monitoring/prometheus/prometheus-rbac.yaml similarity index 100% rename from kustomize/base/monitoring/prometheus/prometheus-rbac.yaml rename to kustomize/bases/monitoring/prometheus/prometheus-rbac.yaml diff --git a/kustomize/base/monitoring/prometheus/prometheus.yaml b/kustomize/bases/monitoring/prometheus/prometheus.yaml similarity index 100% rename from kustomize/base/monitoring/prometheus/prometheus.yaml rename to kustomize/bases/monitoring/prometheus/prometheus.yaml diff --git a/kustomize/base/monitoring/prometheus/servicemonitors.yaml b/kustomize/bases/monitoring/prometheus/servicemonitors.yaml similarity index 100% rename from kustomize/base/monitoring/prometheus/servicemonitors.yaml rename to kustomize/bases/monitoring/prometheus/servicemonitors.yaml diff --git a/kustomize/base/nextcloud/kustomization.yaml b/kustomize/bases/nextcloud/kustomization.yaml similarity index 71% rename from kustomize/base/nextcloud/kustomization.yaml rename to kustomize/bases/nextcloud/kustomization.yaml index c353aca..216aa74 100644 --- a/kustomize/base/nextcloud/kustomization.yaml +++ b/kustomize/bases/nextcloud/kustomization.yaml @@ -1,21 +1,15 @@ -bases: - - ../mariadb - resources: - - namespace.yaml - nextcloud-deployment.yaml - nextcloud-cronjob.yaml secretGenerator: - name: mariadb-credentials-secret type: Opaque - behavior: replace + behavior: create literals: - database=nextcloud - username=nextcloud - password=replaceme -namespace: nextcloud - commonlabels: app: nextcloud \ No newline at end of file diff --git a/kustomize/base/nextcloud/nextcloud-cronjob.yaml b/kustomize/bases/nextcloud/nextcloud-cronjob.yaml similarity index 100% rename from kustomize/base/nextcloud/nextcloud-cronjob.yaml rename to kustomize/bases/nextcloud/nextcloud-cronjob.yaml diff --git a/kustomize/base/nextcloud/nextcloud-deployment.yaml b/kustomize/bases/nextcloud/nextcloud-deployment.yaml similarity index 100% rename from kustomize/base/nextcloud/nextcloud-deployment.yaml rename to kustomize/bases/nextcloud/nextcloud-deployment.yaml diff --git a/kustomize/namespaces/cert-manager/kustomization.yaml b/kustomize/namespaces/cert-manager/kustomization.yaml new file mode 100644 index 0000000..8042cfa --- /dev/null +++ b/kustomize/namespaces/cert-manager/kustomization.yaml @@ -0,0 +1,4 @@ +bases: + - ../../bases/cert-manager + +namespace: cert-manager diff --git a/kustomize/namespaces/gitea/kustomization.yaml b/kustomize/namespaces/gitea/kustomization.yaml new file mode 100644 index 0000000..d155ebb --- /dev/null +++ b/kustomize/namespaces/gitea/kustomization.yaml @@ -0,0 +1,8 @@ +bases: + - ../../bases/gitea + # - ../../base/mariadb + +resources: + - namespace.yaml + +namespace: gitea diff --git a/kustomize/base/gitea/namespace.yaml b/kustomize/namespaces/gitea/namespace.yaml similarity index 100% rename from kustomize/base/gitea/namespace.yaml rename to kustomize/namespaces/gitea/namespace.yaml diff --git a/kustomize/namespaces/grafana/kustomization.yaml b/kustomize/namespaces/grafana/kustomization.yaml new file mode 100644 index 0000000..205954c --- /dev/null +++ b/kustomize/namespaces/grafana/kustomization.yaml @@ -0,0 +1,8 @@ +bases: + - ../../bases/grafana + # - ../../base/mariadb + +resources: + - namespace.yaml + +namespace: grafana diff --git a/kustomize/base/grafana/namespace.yaml b/kustomize/namespaces/grafana/namespace.yaml similarity index 100% rename from kustomize/base/grafana/namespace.yaml rename to kustomize/namespaces/grafana/namespace.yaml diff --git a/kustomize/namespaces/ingress-nginx/kustomization.yaml b/kustomize/namespaces/ingress-nginx/kustomization.yaml new file mode 100644 index 0000000..9bf085c --- /dev/null +++ b/kustomize/namespaces/ingress-nginx/kustomization.yaml @@ -0,0 +1,4 @@ +bases: + - ../../bases/ingress-nginx + +namespace: ingress-nginx diff --git a/kustomize/namespaces/nextcloud/kustomization.yaml b/kustomize/namespaces/nextcloud/kustomization.yaml new file mode 100644 index 0000000..494a201 --- /dev/null +++ b/kustomize/namespaces/nextcloud/kustomization.yaml @@ -0,0 +1,8 @@ +bases: + - ../../bases/nextcloud + # - ../../base/mariadb + +resources: + - namespace.yaml + +namespace: nextcloud diff --git a/kustomize/base/nextcloud/namespace.yaml b/kustomize/namespaces/nextcloud/namespace.yaml similarity index 100% rename from kustomize/base/nextcloud/namespace.yaml rename to kustomize/namespaces/nextcloud/namespace.yaml diff --git a/kustomize/environment/all/kustomization.yaml b/kustomize/overlays/dev-base-deploy/kustomization.yaml similarity index 51% rename from kustomize/environment/all/kustomization.yaml rename to kustomize/overlays/dev-base-deploy/kustomization.yaml index 72c5089..4f3f857 100644 --- a/kustomize/environment/all/kustomization.yaml +++ b/kustomize/overlays/dev-base-deploy/kustomization.yaml @@ -1,7 +1,6 @@ bases: - - ../../base/nfs-provisionner - - ../../base/ingress-nginx - - ../../base/cert-manager + - ../../namespaces/cert-manager + - ../../namespaces/ingress-nginx # allow "kubectl apply -l managed-by=k3s --prune ..." commonlabels: diff --git a/kustomize/environment/dev/cert-manager/clusterissuer.yaml b/kustomize/overlays/dev/cert-manager/clusterissuer.yaml similarity index 100% rename from kustomize/environment/dev/cert-manager/clusterissuer.yaml rename to kustomize/overlays/dev/cert-manager/clusterissuer.yaml diff --git a/kustomize/environment/dev/cert-manager/kustomizeconfig.yaml b/kustomize/overlays/dev/cert-manager/kustomizeconfig.yaml similarity index 100% rename from kustomize/environment/dev/cert-manager/kustomizeconfig.yaml rename to kustomize/overlays/dev/cert-manager/kustomizeconfig.yaml diff --git a/kustomize/environment/dev/kustomization.yaml b/kustomize/overlays/dev/kustomization.yaml similarity index 80% rename from kustomize/environment/dev/kustomization.yaml rename to kustomize/overlays/dev/kustomization.yaml index 6958cb1..c302b62 100644 --- a/kustomize/environment/dev/kustomization.yaml +++ b/kustomize/overlays/dev/kustomization.yaml @@ -1,9 +1,7 @@ bases: - - ../../base/kubernetes-dashboard - - ../../base/gitea - - ../../base/nextcloud - - ../../base/grafana - - ../../base/monitoring + - ../../namespaces/gitea + - ../../namespaces/grafana + - ../../namespaces/nextcloud resources: - cert-manager/clusterissuer.yaml @@ -28,14 +26,14 @@ patchesJson6902: group: networking.k8s.io version: v1beta1 kind: Ingress - name: kubernetes-dashboard + name: gitea patch: |- - op: replace path: /spec/tls/0/hosts/0 - value: kubernetes-dashboard.staging.badjware.dev + value: gitea.staging.badjware.dev - op: replace path: /spec/rules/0/host - value: kubernetes-dashboard.staging.badjware.dev + value: gitea.staging.badjware.dev - target: <<: *ingress_target name: grafana @@ -56,16 +54,6 @@ patchesJson6902: - op: replace path: /spec/rules/0/host value: nextcloud.staging.badjware.dev - - target: - <<: *ingress_target - name: gitea - patch: |- - - op: replace - path: /spec/tls/0/hosts/0 - value: gitea.staging.badjware.dev - - op: replace - path: /spec/rules/0/host - value: gitea.staging.badjware.dev - target: <<: *ingress_target name: drone diff --git a/kustomize/environment/dev/ssm-secrets.yaml b/kustomize/overlays/dev/ssm-secrets.yaml similarity index 100% rename from kustomize/environment/dev/ssm-secrets.yaml rename to kustomize/overlays/dev/ssm-secrets.yaml diff --git a/kustomize/environment/prod/cert-manager/clusterissuer.yaml b/kustomize/overlays/prod/cert-manager/clusterissuer.yaml similarity index 100% rename from kustomize/environment/prod/cert-manager/clusterissuer.yaml rename to kustomize/overlays/prod/cert-manager/clusterissuer.yaml diff --git a/kustomize/environment/prod/cert-manager/kustomizeconfig.yaml b/kustomize/overlays/prod/cert-manager/kustomizeconfig.yaml similarity index 100% rename from kustomize/environment/prod/cert-manager/kustomizeconfig.yaml rename to kustomize/overlays/prod/cert-manager/kustomizeconfig.yaml