From 847a47f357ef1a9dfbeb34d83004dcd50f0c446a Mon Sep 17 00:00:00 2001 From: Drewry Pope Date: Wed, 1 Jan 2025 02:26:38 -0600 Subject: [PATCH] kustomization --- apps/apisix/base/kustomization.yaml | 22 +++++++++++++++++ apps/apisix/base/namespace.yaml | 4 ++++ .../overlays/testing/kustomization.yaml | 24 +++++++++++++++++++ .../overlays/testing/namespace-patch.yaml | 8 +++++++ .../{apisix => unused/apisix-helm}/Chart.yaml | 0 .../apisix-helm}/overlays/testing/values.yaml | 0 .../apisix-helm}/templates/application.yaml | 0 .../apisix-helm}/testing/config_dir.json | 0 .../apisix-helm}/values.yaml | 0 9 files changed, 58 insertions(+) create mode 100644 apps/apisix/base/kustomization.yaml create mode 100644 apps/apisix/base/namespace.yaml create mode 100644 apps/apisix/overlays/testing/kustomization.yaml create mode 100644 apps/apisix/overlays/testing/namespace-patch.yaml rename apps/{apisix => unused/apisix-helm}/Chart.yaml (100%) rename apps/{apisix => unused/apisix-helm}/overlays/testing/values.yaml (100%) rename apps/{apisix => unused/apisix-helm}/templates/application.yaml (100%) rename apps/{apisix => unused/apisix-helm}/testing/config_dir.json (100%) rename apps/{apisix => unused/apisix-helm}/values.yaml (100%) diff --git a/apps/apisix/base/kustomization.yaml b/apps/apisix/base/kustomization.yaml new file mode 100644 index 00000000..43ee4be2 --- /dev/null +++ b/apps/apisix/base/kustomization.yaml @@ -0,0 +1,22 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - namespace.yaml + +helmCharts: + - name: apisix + repo: https://charts.apiseven.com + version: 1.x.x + releaseName: apisix + includeCRDs: true + valuesInline: + dashboard: + enabled: true + ingress-controller: + enabled: true + +commonLabels: + app.kubernetes.io/managed-by: kustomize + +namespace: MUST_BE_SET diff --git a/apps/apisix/base/namespace.yaml b/apps/apisix/base/namespace.yaml new file mode 100644 index 00000000..39425ddd --- /dev/null +++ b/apps/apisix/base/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: MUST_BE_SET diff --git a/apps/apisix/overlays/testing/kustomization.yaml b/apps/apisix/overlays/testing/kustomization.yaml new file mode 100644 index 00000000..0ea535e4 --- /dev/null +++ b/apps/apisix/overlays/testing/kustomization.yaml @@ -0,0 +1,24 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization + +resources: + - ../../base + +namespace: testing-apisix + +patches: + - path: namespace-patch.yaml + +helmCharts: + - name: apisix + repo: https://charts.apiseven.com + version: 1.x.x + releaseName: apisix + includeCRDs: true + valuesInline: + ingress-controller: + config: + apisix: + serviceNamespace: testing-apisix + global: + namespace: testing-apisix diff --git a/apps/apisix/overlays/testing/namespace-patch.yaml b/apps/apisix/overlays/testing/namespace-patch.yaml new file mode 100644 index 00000000..34c7b02a --- /dev/null +++ b/apps/apisix/overlays/testing/namespace-patch.yaml @@ -0,0 +1,8 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: testing-apisix + labels: + environment: testing + app.kubernetes.io/name: apisix + app.kubernetes.io/instance: testing diff --git a/apps/apisix/Chart.yaml b/apps/unused/apisix-helm/Chart.yaml similarity index 100% rename from apps/apisix/Chart.yaml rename to apps/unused/apisix-helm/Chart.yaml diff --git a/apps/apisix/overlays/testing/values.yaml b/apps/unused/apisix-helm/overlays/testing/values.yaml similarity index 100% rename from apps/apisix/overlays/testing/values.yaml rename to apps/unused/apisix-helm/overlays/testing/values.yaml diff --git a/apps/apisix/templates/application.yaml b/apps/unused/apisix-helm/templates/application.yaml similarity index 100% rename from apps/apisix/templates/application.yaml rename to apps/unused/apisix-helm/templates/application.yaml diff --git a/apps/apisix/testing/config_dir.json b/apps/unused/apisix-helm/testing/config_dir.json similarity index 100% rename from apps/apisix/testing/config_dir.json rename to apps/unused/apisix-helm/testing/config_dir.json diff --git a/apps/apisix/values.yaml b/apps/unused/apisix-helm/values.yaml similarity index 100% rename from apps/apisix/values.yaml rename to apps/unused/apisix-helm/values.yaml