From 403db994d9adf0ba5e416a01fa721d74f7d86d0e Mon Sep 17 00:00:00 2001 From: Andrei Kvapil Date: Thu, 1 Feb 2024 12:41:53 +0100 Subject: [PATCH] com Signed-off-by: Andrei Kvapil --- packages/apps/tenant/templates/_helpers.tpl | 9 +++ packages/apps/tenant/templates/addresses.yaml | 21 +++++++ packages/apps/tenant/templates/etcd.yaml | 34 ++++++++++++ packages/apps/tenant/templates/ingress.yaml | 22 ++++++++ .../apps/tenant/templates/monitoring.yaml | 34 ++++++++++++ packages/apps/tenant/templates/tenant.yaml | 55 ++++++++++--------- packages/apps/tenant/values.yaml | 7 +++ packages/core/installer/images/installer.json | 6 +- packages/extra/addresses/Chart.yaml | 2 + .../addresses}/templates/ips.yaml | 0 packages/extra/addresses/values.yaml | 4 ++ packages/extra/etcd/.helmignore | 23 ++++++++ packages/extra/etcd/Chart.yaml | 25 +++++++++ .../extra/etcd/templates/redisfailover.yaml | 52 ++++++++++++++++++ packages/extra/etcd/templates/service.yaml | 25 +++++++++ .../extra/etcd/templates/servicescrape.yaml | 47 ++++++++++++++++ packages/extra/etcd/values.yaml | 4 ++ .../ingress}/.helmignore | 0 packages/extra/ingress/Chart.yaml | 2 + .../ingress-nginx => extra/ingress}/Makefile | 0 .../ingress}/charts/ingress-nginx/.helmignore | 0 .../ingress}/charts/ingress-nginx/Chart.yaml | 0 .../ingress}/charts/ingress-nginx/OWNERS | 0 .../ingress}/charts/ingress-nginx/README.md | 0 .../charts/ingress-nginx/README.md.gotmpl | 0 ...ler-admission-tls-cert-manager-values.yaml | 0 .../controller-custom-ingressclass-flags.yaml | 0 .../ci/daemonset-customconfig-values.yaml | 0 .../ci/daemonset-customnodeport-values.yaml | 0 .../ci/daemonset-extra-modules.yaml | 0 .../ci/daemonset-headers-values.yaml | 0 .../ci/daemonset-internal-lb-values.yaml | 0 .../ci/daemonset-nodeport-values.yaml | 0 .../ci/daemonset-podannotations-values.yaml | 0 ...set-tcp-udp-configMapNamespace-values.yaml | 0 ...emonset-tcp-udp-portNamePrefix-values.yaml | 0 .../ci/daemonset-tcp-udp-values.yaml | 0 .../ci/daemonset-tcp-values.yaml | 0 .../ci/deamonset-default-values.yaml | 0 .../ci/deamonset-metrics-values.yaml | 0 .../ci/deamonset-psp-values.yaml | 0 .../ci/deamonset-webhook-and-psp-values.yaml | 0 .../ci/deamonset-webhook-values.yaml | 0 ...eployment-autoscaling-behavior-values.yaml | 0 .../ci/deployment-autoscaling-values.yaml | 0 .../ci/deployment-customconfig-values.yaml | 0 .../ci/deployment-customnodeport-values.yaml | 0 .../ci/deployment-default-values.yaml | 0 ...modules-default-container-sec-context.yaml | 0 ...odules-specific-container-sec-context.yaml | 0 .../ci/deployment-extra-modules.yaml | 0 .../ci/deployment-headers-values.yaml | 0 .../ci/deployment-internal-lb-values.yaml | 0 .../ci/deployment-metrics-values.yaml | 0 .../ci/deployment-nodeport-values.yaml | 0 .../ci/deployment-podannotations-values.yaml | 0 .../ci/deployment-psp-values.yaml | 0 ...ent-tcp-udp-configMapNamespace-values.yaml | 0 ...loyment-tcp-udp-portNamePrefix-values.yaml | 0 .../ci/deployment-tcp-udp-values.yaml | 0 .../ci/deployment-tcp-values.yaml | 0 .../ci/deployment-webhook-and-psp-values.yaml | 0 .../deployment-webhook-extraEnvs-values.yaml | 0 .../deployment-webhook-resources-values.yaml | 0 .../ci/deployment-webhook-values.yaml | 0 .../charts/ingress-nginx/templates/NOTES.txt | 0 .../ingress-nginx/templates/_helpers.tpl | 0 .../ingress-nginx/templates/_params.tpl | 0 .../admission-webhooks/cert-manager.yaml | 0 .../job-patch/clusterrole.yaml | 0 .../job-patch/clusterrolebinding.yaml | 0 .../job-patch/job-createSecret.yaml | 0 .../job-patch/job-patchWebhook.yaml | 0 .../job-patch/networkpolicy.yaml | 0 .../admission-webhooks/job-patch/psp.yaml | 0 .../admission-webhooks/job-patch/role.yaml | 0 .../job-patch/rolebinding.yaml | 0 .../job-patch/serviceaccount.yaml | 0 .../validating-webhook.yaml | 0 .../ingress-nginx/templates/clusterrole.yaml | 0 .../templates/clusterrolebinding.yaml | 0 .../controller-configmap-addheaders.yaml | 0 .../controller-configmap-proxyheaders.yaml | 0 .../templates/controller-configmap-tcp.yaml | 0 .../templates/controller-configmap-udp.yaml | 0 .../templates/controller-configmap.yaml | 0 .../templates/controller-daemonset.yaml | 0 .../templates/controller-daemonset.yaml.orig | 0 .../templates/controller-deployment.yaml | 0 .../templates/controller-hpa.yaml | 0 .../templates/controller-ingressclass.yaml | 0 .../templates/controller-keda.yaml | 0 .../templates/controller-networkpolicy.yaml | 0 .../controller-poddisruptionbudget.yaml | 0 .../templates/controller-prometheusrules.yaml | 0 .../templates/controller-psp.yaml | 0 .../templates/controller-role.yaml | 0 .../templates/controller-rolebinding.yaml | 0 .../templates/controller-secret.yaml | 0 .../controller-service-internal.yaml | 0 .../templates/controller-service-metrics.yaml | 0 .../templates/controller-service-webhook.yaml | 0 .../templates/controller-service.yaml | 0 .../templates/controller-serviceaccount.yaml | 0 .../templates/controller-servicemonitor.yaml | 0 .../templates/default-backend-deployment.yaml | 0 .../default-backend-extra-configmaps.yaml | 0 .../templates/default-backend-hpa.yaml | 0 .../default-backend-networkpolicy.yaml | 0 .../default-backend-poddisruptionbudget.yaml | 0 .../templates/default-backend-psp.yaml | 0 .../templates/default-backend-role.yaml | 0 .../default-backend-rolebinding.yaml | 0 .../templates/default-backend-service.yaml | 0 .../default-backend-serviceaccount.yaml | 0 ...default-backend-extra-configmaps_test.yaml | 0 .../ingress}/charts/ingress-nginx/values.yaml | 0 .../ingress}/patches/add-metrics2.patch | 0 .../ingress}/values.yaml | 0 .../monitoring}/Chart.yaml | 2 +- .../monitoring}/dashboards.list | 0 .../monitoring}/patches/1.diff | 0 .../monitoring}/templates/dashboards.yaml | 0 .../monitoring}/templates/grafana/db.yaml | 0 .../templates/grafana/grafana.yaml | 0 .../monitoring}/templates/grafana/secret.yaml | 0 .../templates/oncall/oncall-db.yaml | 0 .../templates/oncall/oncall-redis.yaml | 0 .../templates/oncall/oncall-release.yaml | 0 .../templates/vm/grafana-datasource.yaml | 0 .../templates/vm/vmalert-scrape.yaml | 0 .../monitoring}/templates/vm/vmalert.yaml | 0 .../templates/vm/vmalertmanager.yaml | 0 .../templates/vm/vmcluster-scrape.yaml | 0 .../monitoring}/templates/vm/vmcluster.yaml | 0 .../monitoring}/values.yaml | 0 packages/extra/versions_map | 4 +- packages/system/ingress-nginx/Chart.yaml | 2 - packages/system/kamaji/Makefile | 1 + .../system/kamaji/charts/kamaji/Chart.yaml | 4 +- .../system/kamaji/charts/kamaji/README.md | 2 +- packages/system/metallb-addresses/Chart.yaml | 2 - packages/system/metallb-addresses/Makefile | 11 ---- 143 files changed, 351 insertions(+), 49 deletions(-) create mode 100644 packages/apps/tenant/templates/_helpers.tpl create mode 100644 packages/apps/tenant/templates/addresses.yaml create mode 100644 packages/apps/tenant/templates/etcd.yaml create mode 100644 packages/apps/tenant/templates/ingress.yaml create mode 100644 packages/apps/tenant/templates/monitoring.yaml create mode 100644 packages/apps/tenant/values.yaml create mode 100644 packages/extra/addresses/Chart.yaml rename packages/{system/metallb-addresses => extra/addresses}/templates/ips.yaml (100%) create mode 100644 packages/extra/addresses/values.yaml create mode 100644 packages/extra/etcd/.helmignore create mode 100644 packages/extra/etcd/Chart.yaml create mode 100644 packages/extra/etcd/templates/redisfailover.yaml create mode 100644 packages/extra/etcd/templates/service.yaml create mode 100644 packages/extra/etcd/templates/servicescrape.yaml create mode 100644 packages/extra/etcd/values.yaml rename packages/{system/ingress-nginx => extra/ingress}/.helmignore (100%) create mode 100644 packages/extra/ingress/Chart.yaml rename packages/{system/ingress-nginx => extra/ingress}/Makefile (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/.helmignore (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/Chart.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/OWNERS (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/README.md (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/README.md.gotmpl (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/controller-admission-tls-cert-manager-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-customnodeport-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-extra-modules.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-headers-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-nodeport-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-podannotations-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-tcp-udp-configMapNamespace-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-tcp-udp-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/daemonset-tcp-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deamonset-default-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deamonset-metrics-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deamonset-psp-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deamonset-webhook-and-psp-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deamonset-webhook-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-autoscaling-behavior-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-autoscaling-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-customconfig-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-customnodeport-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-default-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-extra-modules.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-headers-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-internal-lb-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-metrics-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-nodeport-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-podannotations-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-psp-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-tcp-udp-configMapNamespace-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-tcp-udp-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-tcp-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-webhook-and-psp-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/ci/deployment-webhook-values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/NOTES.txt (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/_helpers.tpl (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/_params.tpl (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/cert-manager.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/job-patch/networkpolicy.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/clusterrole.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/clusterrolebinding.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-configmap-addheaders.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-configmap-tcp.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-configmap-udp.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-configmap.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-daemonset.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-daemonset.yaml.orig (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-deployment.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-hpa.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-ingressclass.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-keda.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-networkpolicy.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-prometheusrules.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-psp.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-role.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-rolebinding.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-secret.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-service-internal.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-service-metrics.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-service-webhook.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-service.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-serviceaccount.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/controller-servicemonitor.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-deployment.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-extra-configmaps.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-hpa.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-networkpolicy.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-psp.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-role.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-rolebinding.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-service.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/tests/default-backend-extra-configmaps_test.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/charts/ingress-nginx/values.yaml (100%) rename packages/{system/ingress-nginx => extra/ingress}/patches/add-metrics2.patch (100%) rename packages/{system/ingress-nginx => extra/ingress}/values.yaml (100%) rename packages/{apps/observability => extra/monitoring}/Chart.yaml (88%) rename packages/{apps/observability => extra/monitoring}/dashboards.list (100%) rename packages/{apps/observability => extra/monitoring}/patches/1.diff (100%) rename packages/{apps/observability => extra/monitoring}/templates/dashboards.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/grafana/db.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/grafana/grafana.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/grafana/secret.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/oncall/oncall-db.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/oncall/oncall-redis.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/oncall/oncall-release.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/vm/grafana-datasource.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/vm/vmalert-scrape.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/vm/vmalert.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/vm/vmalertmanager.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/vm/vmcluster-scrape.yaml (100%) rename packages/{apps/observability => extra/monitoring}/templates/vm/vmcluster.yaml (100%) rename packages/{apps/observability => extra/monitoring}/values.yaml (100%) delete mode 100644 packages/system/ingress-nginx/Chart.yaml delete mode 100644 packages/system/metallb-addresses/Chart.yaml delete mode 100644 packages/system/metallb-addresses/Makefile diff --git a/packages/apps/tenant/templates/_helpers.tpl b/packages/apps/tenant/templates/_helpers.tpl new file mode 100644 index 00000000..42d3a7dc --- /dev/null +++ b/packages/apps/tenant/templates/_helpers.tpl @@ -0,0 +1,9 @@ +{{- define "tenant.name" -}} +{{- if ne (len (splitList "-" .Release.Name)) 1 }} +{{- fail (printf "Release name should not contain dashes: %s" .Release.Name) }} +{{- end }} +{{- printf "tenant-%s" .Release.Name }} +{{- if and (ne .Release.Namespace "tenant-root") (hasPrefix "tenant-" .Release.Namespace) }} +{{- printf "%s-%s" .Release.Namespace .Release.Name }} +{{- end }} +{{- end }} diff --git a/packages/apps/tenant/templates/addresses.yaml b/packages/apps/tenant/templates/addresses.yaml new file mode 100644 index 00000000..8754be1d --- /dev/null +++ b/packages/apps/tenant/templates/addresses.yaml @@ -0,0 +1,21 @@ +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: addresses + namespace: {{ include "tenant.name" . }} + labels: + cozystack.io/ui: "true" + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + chart: + spec: + chart: cozy-addresses + reconcileStrategy: Revision + sourceRef: + kind: HelmRepository + name: cozystack-extra + namespace: cozy-public + version: 0.1.0 + interval: 1m0s + timeout: 5m0s diff --git a/packages/apps/tenant/templates/etcd.yaml b/packages/apps/tenant/templates/etcd.yaml new file mode 100644 index 00000000..82e562dc --- /dev/null +++ b/packages/apps/tenant/templates/etcd.yaml @@ -0,0 +1,34 @@ +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: etcd + namespace: {{ include "tenant.name" . }} + labels: + cozystack.io/ui: "true" + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + chart: + spec: + chart: cozy-etcd + reconcileStrategy: Revision + sourceRef: + kind: HelmRepository + name: cozystack-extra + namespace: cozy-public + version: 0.1.0 + interval: 1m0s + timeout: 5m0s + values: + metricsStorages: + - name: shortterm + retentionPeriod: "3d" + deduplicationInterval: "5m" + storage: 10Gi + - name: longterm + retentionPeriod: "14d" + deduplicationInterval: "15s" + storage: 10Gi + + oncall: + enabled: false diff --git a/packages/apps/tenant/templates/ingress.yaml b/packages/apps/tenant/templates/ingress.yaml new file mode 100644 index 00000000..21c37e56 --- /dev/null +++ b/packages/apps/tenant/templates/ingress.yaml @@ -0,0 +1,22 @@ +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: ingress + namespace: {{ include "tenant.name" . }} + labels: + cozystack.io/ui: "true" + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + chart: + spec: + chart: cozy-ingress + reconcileStrategy: Revision + sourceRef: + kind: HelmRepository + name: cozystack-extra + namespace: cozy-public + version: 0.1.0 + interval: 1m0s + timeout: 5m0s + values: {} diff --git a/packages/apps/tenant/templates/monitoring.yaml b/packages/apps/tenant/templates/monitoring.yaml new file mode 100644 index 00000000..ab2cc5bb --- /dev/null +++ b/packages/apps/tenant/templates/monitoring.yaml @@ -0,0 +1,34 @@ +apiVersion: helm.toolkit.fluxcd.io/v2beta1 +kind: HelmRelease +metadata: + name: monitoring + namespace: {{ include "tenant.name" . }} + labels: + cozystack.io/ui: "true" + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + chart: + spec: + chart: cozy-monitoring + reconcileStrategy: Revision + sourceRef: + kind: HelmRepository + name: cozystack-extra + namespace: cozy-public + version: 0.1.0 + interval: 1m0s + timeout: 5m0s + values: + metricsStorages: + - name: shortterm + retentionPeriod: "3d" + deduplicationInterval: "5m" + storage: 10Gi + - name: longterm + retentionPeriod: "14d" + deduplicationInterval: "15s" + storage: 10Gi + + oncall: + enabled: false diff --git a/packages/apps/tenant/templates/tenant.yaml b/packages/apps/tenant/templates/tenant.yaml index a366959c..51039c1e 100644 --- a/packages/apps/tenant/templates/tenant.yaml +++ b/packages/apps/tenant/templates/tenant.yaml @@ -1,36 +1,41 @@ -{{- if ne (len (splitList "-" .Release.Name)) 1 }} -{{- fail (printf "Release name should not contain dashes: %s" .Release.Name) }} -{{- end }} -{{- $tenantName := (printf "tenant-%s" .Release.Name) }} -{{- if and (ne .Release.Namespace "tenant-root") (hasPrefix "tenant-" .Release.Namespace) }} -{{- $tenantName = (printf "%s-%s" .Release.Namespace .Release.Name) }} -{{- end }} --- apiVersion: v1 kind: Namespace metadata: - name: {{ $tenantName }} + name: {{ include "tenant.name" . }} + {{- if hasPrefix "tenant-" .Release.Namespace }} + {{- $existingNS := lookup "v1" "Namespace" "" .Release.Namespace }} + {{- if $existingNS }} + ownerReferences: + - apiVersion: v1 + blockOwnerDeletion: true + controller: true + kind: Namespace + name: {{ .Release.Namespace }} + uid: {{ $existingNS.metadata.uid }} + {{- end }} + {{- end }} --- apiVersion: v1 kind: ServiceAccount metadata: - name: {{ $tenantName }} - namespace: {{ $tenantName }} + name: {{ include "tenant.name" . }} + namespace: {{ include "tenant.name" . }} --- apiVersion: v1 kind: Secret metadata: - name: {{ $tenantName }} - namespace: {{ $tenantName }} + name: {{ include "tenant.name" . }} + namespace: {{ include "tenant.name" . }} annotations: - kubernetes.io/service-account.name: {{ $tenantName }} + kubernetes.io/service-account.name: {{ include "tenant.name" . }} type: kubernetes.io/service-account-token --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ $tenantName }} - namespace: {{ $tenantName }} + name: {{ include "tenant.name" . }} + namespace: {{ include "tenant.name" . }} rules: - apiGroups: [""] resources: ["*"] @@ -42,8 +47,8 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ $tenantName }} - namespace: {{ $tenantName }} + name: {{ include "tenant.name" . }} + namespace: {{ include "tenant.name" . }} subjects: {{- if ne .Release.Namespace "tenant-root" }} - kind: ServiceAccount @@ -61,17 +66,17 @@ subjects: {{- end }} {{- end }} - kind: ServiceAccount - name: {{ $tenantName }} - namespace: {{ $tenantName }} + name: {{ include "tenant.name" . }} + namespace: {{ include "tenant.name" . }} roleRef: kind: Role - name: {{ $tenantName }} + name: {{ include "tenant.name" . }} apiGroup: rbac.authorization.k8s.io --- apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: - name: {{ $tenantName }} + name: {{ include "tenant.name" . }} namespace: cozy-public rules: - apiGroups: ["source.toolkit.fluxcd.io"] @@ -84,13 +89,13 @@ rules: apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: - name: {{ $tenantName }} + name: {{ include "tenant.name" . }} namespace: cozy-public subjects: - kind: ServiceAccount - name: {{ $tenantName }} - namespace: {{ $tenantName }} + name: {{ include "tenant.name" . }} + namespace: {{ include "tenant.name" . }} roleRef: kind: Role - name: {{ $tenantName }} + name: {{ include "tenant.name" . }} apiGroup: rbac.authorization.k8s.io diff --git a/packages/apps/tenant/values.yaml b/packages/apps/tenant/values.yaml new file mode 100644 index 00000000..0341e1d6 --- /dev/null +++ b/packages/apps/tenant/values.yaml @@ -0,0 +1,7 @@ +ownEtcd: false +ownMonitoring: false +ownIngress: false +ownAddresses: false + +domain: example.org +storageClass: linstor-lvm diff --git a/packages/core/installer/images/installer.json b/packages/core/installer/images/installer.json index 7dce54b7..dda9c11d 100644 --- a/packages/core/installer/images/installer.json +++ b/packages/core/installer/images/installer.json @@ -1,14 +1,14 @@ { - "containerimage.config.digest": "sha256:ebdd696428a92af919a25f7c5027490ba40c81dfc171aa24017594daba0117b6", + "containerimage.config.digest": "sha256:dd8460f8246e5c91bce19e507be5b1074662a9edaec0e8dd2ddd0f31b1011faf", "containerimage.descriptor": { "mediaType": "application/vnd.docker.distribution.manifest.v2+json", - "digest": "sha256:092089b46a3fac5eb389a2ff14553f72ea7665837e62722d23113f8cd772f1e7", + "digest": "sha256:88967f46141e47b773947b38315a518536550ead4eb43bfc265b954b8697aee4", "size": 2074, "platform": { "architecture": "amd64", "os": "linux" } }, - "containerimage.digest": "sha256:092089b46a3fac5eb389a2ff14553f72ea7665837e62722d23113f8cd772f1e7", + "containerimage.digest": "sha256:88967f46141e47b773947b38315a518536550ead4eb43bfc265b954b8697aee4", "image.name": "ghcr.io/aenix-io/cozystack/installer:latest" } \ No newline at end of file diff --git a/packages/extra/addresses/Chart.yaml b/packages/extra/addresses/Chart.yaml new file mode 100644 index 00000000..d8430555 --- /dev/null +++ b/packages/extra/addresses/Chart.yaml @@ -0,0 +1,2 @@ +name: cozy-addresses +version: 1.0.0 diff --git a/packages/system/metallb-addresses/templates/ips.yaml b/packages/extra/addresses/templates/ips.yaml similarity index 100% rename from packages/system/metallb-addresses/templates/ips.yaml rename to packages/extra/addresses/templates/ips.yaml diff --git a/packages/extra/addresses/values.yaml b/packages/extra/addresses/values.yaml new file mode 100644 index 00000000..09d48831 --- /dev/null +++ b/packages/extra/addresses/values.yaml @@ -0,0 +1,4 @@ +pools: +- name: local + addresses: + - 192.168.100.200-192.168.100.250 diff --git a/packages/extra/etcd/.helmignore b/packages/extra/etcd/.helmignore new file mode 100644 index 00000000..0e8a0eb3 --- /dev/null +++ b/packages/extra/etcd/.helmignore @@ -0,0 +1,23 @@ +# Patterns to ignore when building packages. +# This supports shell glob matching, relative path matching, and +# negation (prefixed with !). Only one pattern per line. +.DS_Store +# Common VCS dirs +.git/ +.gitignore +.bzr/ +.bzrignore +.hg/ +.hgignore +.svn/ +# Common backup files +*.swp +*.bak +*.tmp +*.orig +*~ +# Various IDEs +.project +.idea/ +*.tmproj +.vscode/ diff --git a/packages/extra/etcd/Chart.yaml b/packages/extra/etcd/Chart.yaml new file mode 100644 index 00000000..17e58c9d --- /dev/null +++ b/packages/extra/etcd/Chart.yaml @@ -0,0 +1,25 @@ +apiVersion: v2 +name: cozy-etcd +description: Managed Redis service +icon: https://cdn4.iconfinder.com/data/icons/redis-2/1451/Untitled-2-512.png + +# A chart can be either an 'application' or a 'library' chart. +# +# Application charts are a collection of templates that can be packaged into versioned archives +# to be deployed. +# +# Library charts provide useful utilities or functions for the chart developer. They're included as +# a dependency of application charts to inject those utilities and functions into the rendering +# pipeline. Library charts do not define any templates and therefore cannot be deployed. +type: application + +# This is the chart version. This version number should be incremented each time you make changes +# to the chart and its templates, including the app version. +# Versions are expected to follow Semantic Versioning (https://semver.org/) +version: 0.1.1 + +# This is the version number of the application being deployed. This version number should be +# incremented each time you make changes to the application. Versions are not expected to +# follow Semantic Versioning. They should reflect the version the application is using. +# It is recommended to use it with quotes. +appVersion: "1.16.0" diff --git a/packages/extra/etcd/templates/redisfailover.yaml b/packages/extra/etcd/templates/redisfailover.yaml new file mode 100644 index 00000000..611a6396 --- /dev/null +++ b/packages/extra/etcd/templates/redisfailover.yaml @@ -0,0 +1,52 @@ +apiVersion: databases.spotahome.com/v1 +kind: RedisFailover +metadata: + name: {{ .Release.Name }} + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + sentinel: + replicas: 3 + resources: + requests: + cpu: 100m + limits: + memory: 100Mi + redis: + replicas: 3 + resources: + requests: + cpu: 150m + memory: 400Mi + limits: + cpu: 2 + memory: 1000Mi + {{- with .Values.size }} + storage: + persistentVolumeClaim: + metadata: + name: redisfailover-persistent-data + spec: + accessModes: + - ReadWriteOnce + resources: + requests: + storage: {{ . }} + {{- end }} + exporter: + enabled: true + image: oliver006/redis_exporter:v1.55.0-alpine + args: + - --web.telemetry-path + - /metrics + env: + - name: REDIS_EXPORTER_LOG_FORMAT + value: txt + customConfig: + - tcp-keepalive 0 + - loglevel notice + {{- if not .Values.size }} + - appendonly no + - save "" + {{- end }} diff --git a/packages/extra/etcd/templates/service.yaml b/packages/extra/etcd/templates/service.yaml new file mode 100644 index 00000000..521f876e --- /dev/null +++ b/packages/extra/etcd/templates/service.yaml @@ -0,0 +1,25 @@ +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-external-lb + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + annotations: + metallb.universe.tf/address-pool: {{ .Values.primaryService.ipPool }} + metallb.universe.tf/ip-allocated-from-pool: {{ .Values.primaryService.ipPool }} + metallb.universe.tf/loadBalancerIPs: {{ .Values.primaryService.ipAddress }} +spec: + type: LoadBalancer + externalTrafficPolicy: Local + allocateLoadBalancerNodePorts: false + selector: + app.kubernetes.io/component: redis + app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/part-of: redis-failover + redisfailovers-role: master + ports: + - name: redis + port: 6379 + targetPort: redis diff --git a/packages/extra/etcd/templates/servicescrape.yaml b/packages/extra/etcd/templates/servicescrape.yaml new file mode 100644 index 00000000..55fd277a --- /dev/null +++ b/packages/extra/etcd/templates/servicescrape.yaml @@ -0,0 +1,47 @@ +apiVersion: operator.victoriametrics.com/v1beta1 +kind: VMServiceScrape +metadata: + name: {{ .Release.Name }} + labels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + jobLabel: jobLabel + namespaceSelector: + matchNames: + - {{ .Release.Namespace }} + endpoints: + - metricRelabelConfigs: + relabelConfigs: + - replacement: redis + targetLabel: job + - sourceLabels: [__meta_kubernetes_pod_node_name] + targetLabel: node + - replacement: cluster + targetLabel: tier + - target_label: service + replacement: {{ .Release.Name }} + port: metrics + jobLabel: jobLabel + selector: + matchLabels: + app: {{ .Release.Name }}-metrics +--- +apiVersion: v1 +kind: Service +metadata: + name: {{ .Release.Name }}-metrics + labels: + app: {{ .Release.Name }}-metrics + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/managed-by: {{ .Release.Service }} + annotations: +spec: + selector: + app.kubernetes.io/component: redis + app.kubernetes.io/name: {{ .Release.Name }} + app.kubernetes.io/part-of: redis-failover + ports: + - name: metrics + port: 9121 + targetPort: metrics diff --git a/packages/extra/etcd/values.yaml b/packages/extra/etcd/values.yaml new file mode 100644 index 00000000..5c467dfb --- /dev/null +++ b/packages/extra/etcd/values.yaml @@ -0,0 +1,4 @@ +size: 5Gi +primaryService: + ipPool: private-ips + ipAddress: 10.100.255.24 diff --git a/packages/system/ingress-nginx/.helmignore b/packages/extra/ingress/.helmignore similarity index 100% rename from packages/system/ingress-nginx/.helmignore rename to packages/extra/ingress/.helmignore diff --git a/packages/extra/ingress/Chart.yaml b/packages/extra/ingress/Chart.yaml new file mode 100644 index 00000000..2b71f695 --- /dev/null +++ b/packages/extra/ingress/Chart.yaml @@ -0,0 +1,2 @@ +name: cozy-ingress +version: 1.0.0 diff --git a/packages/system/ingress-nginx/Makefile b/packages/extra/ingress/Makefile similarity index 100% rename from packages/system/ingress-nginx/Makefile rename to packages/extra/ingress/Makefile diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/.helmignore b/packages/extra/ingress/charts/ingress-nginx/.helmignore similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/.helmignore rename to packages/extra/ingress/charts/ingress-nginx/.helmignore diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/Chart.yaml b/packages/extra/ingress/charts/ingress-nginx/Chart.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/Chart.yaml rename to packages/extra/ingress/charts/ingress-nginx/Chart.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/OWNERS b/packages/extra/ingress/charts/ingress-nginx/OWNERS similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/OWNERS rename to packages/extra/ingress/charts/ingress-nginx/OWNERS diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/README.md b/packages/extra/ingress/charts/ingress-nginx/README.md similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/README.md rename to packages/extra/ingress/charts/ingress-nginx/README.md diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/README.md.gotmpl b/packages/extra/ingress/charts/ingress-nginx/README.md.gotmpl similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/README.md.gotmpl rename to packages/extra/ingress/charts/ingress-nginx/README.md.gotmpl diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-admission-tls-cert-manager-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/controller-admission-tls-cert-manager-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-admission-tls-cert-manager-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/controller-admission-tls-cert-manager-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/controller-custom-ingressclass-flags.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-customconfig-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customnodeport-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-customnodeport-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-customnodeport-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-customnodeport-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-extra-modules.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-extra-modules.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-extra-modules.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-extra-modules.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-headers-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-headers-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-headers-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-headers-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-internal-lb-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-nodeport-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-nodeport-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-nodeport-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-nodeport-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-podannotations-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-podannotations-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-podannotations-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-podannotations-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-configMapNamespace-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-tcp-udp-configMapNamespace-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-configMapNamespace-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-tcp-udp-configMapNamespace-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-tcp-udp-portNamePrefix-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-tcp-udp-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-udp-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-tcp-udp-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/daemonset-tcp-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/daemonset-tcp-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/daemonset-tcp-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-default-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deamonset-default-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-default-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deamonset-default-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-metrics-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deamonset-metrics-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-metrics-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deamonset-metrics-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-psp-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deamonset-psp-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-psp-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deamonset-psp-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-webhook-and-psp-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deamonset-webhook-and-psp-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-webhook-and-psp-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deamonset-webhook-and-psp-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-webhook-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deamonset-webhook-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deamonset-webhook-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deamonset-webhook-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-behavior-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-autoscaling-behavior-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-behavior-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-autoscaling-behavior-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-autoscaling-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-autoscaling-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-autoscaling-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customconfig-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-customconfig-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customconfig-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-customconfig-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customnodeport-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-customnodeport-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-customnodeport-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-customnodeport-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-default-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-default-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-default-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-default-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-extra-modules-default-container-sec-context.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-extra-modules-specific-container-sec-context.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-extra-modules.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-extra-modules.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-extra-modules.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-headers-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-headers-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-headers-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-headers-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-internal-lb-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-internal-lb-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-internal-lb-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-internal-lb-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-metrics-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-metrics-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-metrics-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-metrics-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-nodeport-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-nodeport-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-nodeport-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-nodeport-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-podannotations-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-podannotations-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-podannotations-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-podannotations-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-psp-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-psp-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-psp-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-psp-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-configMapNamespace-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-tcp-udp-configMapNamespace-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-configMapNamespace-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-tcp-udp-configMapNamespace-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-tcp-udp-portNamePrefix-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-tcp-udp-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-udp-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-tcp-udp-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-tcp-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-tcp-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-tcp-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-and-psp-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-webhook-and-psp-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-and-psp-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-webhook-and-psp-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-webhook-extraEnvs-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-webhook-resources-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-values.yaml b/packages/extra/ingress/charts/ingress-nginx/ci/deployment-webhook-values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/ci/deployment-webhook-values.yaml rename to packages/extra/ingress/charts/ingress-nginx/ci/deployment-webhook-values.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/NOTES.txt b/packages/extra/ingress/charts/ingress-nginx/templates/NOTES.txt similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/NOTES.txt rename to packages/extra/ingress/charts/ingress-nginx/templates/NOTES.txt diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/_helpers.tpl b/packages/extra/ingress/charts/ingress-nginx/templates/_helpers.tpl similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/_helpers.tpl rename to packages/extra/ingress/charts/ingress-nginx/templates/_helpers.tpl diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/_params.tpl b/packages/extra/ingress/charts/ingress-nginx/templates/_params.tpl similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/_params.tpl rename to packages/extra/ingress/charts/ingress-nginx/templates/_params.tpl diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/cert-manager.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/cert-manager.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/cert-manager.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/cert-manager.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/networkpolicy.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/networkpolicy.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/networkpolicy.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/networkpolicy.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/psp.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/clusterrole.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/clusterrole.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/clusterrole.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/clusterrole.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/clusterrolebinding.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/clusterrolebinding.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/clusterrolebinding.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/clusterrolebinding.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap-addheaders.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap-addheaders.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap-addheaders.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap-addheaders.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap-proxyheaders.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap-tcp.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap-tcp.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap-tcp.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap-tcp.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap-udp.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap-udp.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap-udp.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap-udp.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-configmap.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-configmap.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-daemonset.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-daemonset.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-daemonset.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-daemonset.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-daemonset.yaml.orig b/packages/extra/ingress/charts/ingress-nginx/templates/controller-daemonset.yaml.orig similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-daemonset.yaml.orig rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-daemonset.yaml.orig diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-deployment.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-deployment.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-deployment.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-deployment.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-hpa.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-hpa.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-hpa.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-hpa.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-ingressclass.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-ingressclass.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-ingressclass.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-ingressclass.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-keda.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-keda.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-keda.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-keda.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-networkpolicy.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-networkpolicy.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-networkpolicy.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-networkpolicy.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-poddisruptionbudget.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-prometheusrules.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-prometheusrules.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-prometheusrules.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-prometheusrules.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-psp.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-psp.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-psp.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-psp.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-role.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-role.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-role.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-role.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-rolebinding.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-rolebinding.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-rolebinding.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-rolebinding.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-secret.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-secret.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-secret.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-secret.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-internal.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-service-internal.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-internal.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-service-internal.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-metrics.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-service-metrics.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-metrics.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-service-metrics.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-webhook.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-service-webhook.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service-webhook.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-service-webhook.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-service.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-service.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-service.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-serviceaccount.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-serviceaccount.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-serviceaccount.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-serviceaccount.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-servicemonitor.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/controller-servicemonitor.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/controller-servicemonitor.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/controller-servicemonitor.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-deployment.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-deployment.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-deployment.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-deployment.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-extra-configmaps.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-extra-configmaps.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-extra-configmaps.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-extra-configmaps.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-hpa.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-hpa.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-hpa.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-hpa.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-networkpolicy.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-networkpolicy.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-networkpolicy.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-networkpolicy.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-poddisruptionbudget.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-psp.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-psp.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-psp.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-psp.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-role.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-role.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-role.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-role.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-rolebinding.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-rolebinding.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-rolebinding.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-rolebinding.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-service.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-service.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-service.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-service.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml b/packages/extra/ingress/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml rename to packages/extra/ingress/charts/ingress-nginx/templates/default-backend-serviceaccount.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-extra-configmaps_test.yaml b/packages/extra/ingress/charts/ingress-nginx/tests/default-backend-extra-configmaps_test.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/tests/default-backend-extra-configmaps_test.yaml rename to packages/extra/ingress/charts/ingress-nginx/tests/default-backend-extra-configmaps_test.yaml diff --git a/packages/system/ingress-nginx/charts/ingress-nginx/values.yaml b/packages/extra/ingress/charts/ingress-nginx/values.yaml similarity index 100% rename from packages/system/ingress-nginx/charts/ingress-nginx/values.yaml rename to packages/extra/ingress/charts/ingress-nginx/values.yaml diff --git a/packages/system/ingress-nginx/patches/add-metrics2.patch b/packages/extra/ingress/patches/add-metrics2.patch similarity index 100% rename from packages/system/ingress-nginx/patches/add-metrics2.patch rename to packages/extra/ingress/patches/add-metrics2.patch diff --git a/packages/system/ingress-nginx/values.yaml b/packages/extra/ingress/values.yaml similarity index 100% rename from packages/system/ingress-nginx/values.yaml rename to packages/extra/ingress/values.yaml diff --git a/packages/apps/observability/Chart.yaml b/packages/extra/monitoring/Chart.yaml similarity index 88% rename from packages/apps/observability/Chart.yaml rename to packages/extra/monitoring/Chart.yaml index 4d09feb7..210b74ab 100644 --- a/packages/apps/observability/Chart.yaml +++ b/packages/extra/monitoring/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: observability +name: cozy-monitoring description: Monitoring and observability stack icon: https://www.svgrepo.com/download/184787/analytics-laptop.svg type: application diff --git a/packages/apps/observability/dashboards.list b/packages/extra/monitoring/dashboards.list similarity index 100% rename from packages/apps/observability/dashboards.list rename to packages/extra/monitoring/dashboards.list diff --git a/packages/apps/observability/patches/1.diff b/packages/extra/monitoring/patches/1.diff similarity index 100% rename from packages/apps/observability/patches/1.diff rename to packages/extra/monitoring/patches/1.diff diff --git a/packages/apps/observability/templates/dashboards.yaml b/packages/extra/monitoring/templates/dashboards.yaml similarity index 100% rename from packages/apps/observability/templates/dashboards.yaml rename to packages/extra/monitoring/templates/dashboards.yaml diff --git a/packages/apps/observability/templates/grafana/db.yaml b/packages/extra/monitoring/templates/grafana/db.yaml similarity index 100% rename from packages/apps/observability/templates/grafana/db.yaml rename to packages/extra/monitoring/templates/grafana/db.yaml diff --git a/packages/apps/observability/templates/grafana/grafana.yaml b/packages/extra/monitoring/templates/grafana/grafana.yaml similarity index 100% rename from packages/apps/observability/templates/grafana/grafana.yaml rename to packages/extra/monitoring/templates/grafana/grafana.yaml diff --git a/packages/apps/observability/templates/grafana/secret.yaml b/packages/extra/monitoring/templates/grafana/secret.yaml similarity index 100% rename from packages/apps/observability/templates/grafana/secret.yaml rename to packages/extra/monitoring/templates/grafana/secret.yaml diff --git a/packages/apps/observability/templates/oncall/oncall-db.yaml b/packages/extra/monitoring/templates/oncall/oncall-db.yaml similarity index 100% rename from packages/apps/observability/templates/oncall/oncall-db.yaml rename to packages/extra/monitoring/templates/oncall/oncall-db.yaml diff --git a/packages/apps/observability/templates/oncall/oncall-redis.yaml b/packages/extra/monitoring/templates/oncall/oncall-redis.yaml similarity index 100% rename from packages/apps/observability/templates/oncall/oncall-redis.yaml rename to packages/extra/monitoring/templates/oncall/oncall-redis.yaml diff --git a/packages/apps/observability/templates/oncall/oncall-release.yaml b/packages/extra/monitoring/templates/oncall/oncall-release.yaml similarity index 100% rename from packages/apps/observability/templates/oncall/oncall-release.yaml rename to packages/extra/monitoring/templates/oncall/oncall-release.yaml diff --git a/packages/apps/observability/templates/vm/grafana-datasource.yaml b/packages/extra/monitoring/templates/vm/grafana-datasource.yaml similarity index 100% rename from packages/apps/observability/templates/vm/grafana-datasource.yaml rename to packages/extra/monitoring/templates/vm/grafana-datasource.yaml diff --git a/packages/apps/observability/templates/vm/vmalert-scrape.yaml b/packages/extra/monitoring/templates/vm/vmalert-scrape.yaml similarity index 100% rename from packages/apps/observability/templates/vm/vmalert-scrape.yaml rename to packages/extra/monitoring/templates/vm/vmalert-scrape.yaml diff --git a/packages/apps/observability/templates/vm/vmalert.yaml b/packages/extra/monitoring/templates/vm/vmalert.yaml similarity index 100% rename from packages/apps/observability/templates/vm/vmalert.yaml rename to packages/extra/monitoring/templates/vm/vmalert.yaml diff --git a/packages/apps/observability/templates/vm/vmalertmanager.yaml b/packages/extra/monitoring/templates/vm/vmalertmanager.yaml similarity index 100% rename from packages/apps/observability/templates/vm/vmalertmanager.yaml rename to packages/extra/monitoring/templates/vm/vmalertmanager.yaml diff --git a/packages/apps/observability/templates/vm/vmcluster-scrape.yaml b/packages/extra/monitoring/templates/vm/vmcluster-scrape.yaml similarity index 100% rename from packages/apps/observability/templates/vm/vmcluster-scrape.yaml rename to packages/extra/monitoring/templates/vm/vmcluster-scrape.yaml diff --git a/packages/apps/observability/templates/vm/vmcluster.yaml b/packages/extra/monitoring/templates/vm/vmcluster.yaml similarity index 100% rename from packages/apps/observability/templates/vm/vmcluster.yaml rename to packages/extra/monitoring/templates/vm/vmcluster.yaml diff --git a/packages/apps/observability/values.yaml b/packages/extra/monitoring/values.yaml similarity index 100% rename from packages/apps/observability/values.yaml rename to packages/extra/monitoring/values.yaml diff --git a/packages/extra/versions_map b/packages/extra/versions_map index 0d4a47f7..80609776 100644 --- a/packages/extra/versions_map +++ b/packages/extra/versions_map @@ -1,5 +1,5 @@ -cozy-ingress 1.0.0 HEAD cozy-addresses 1.0.0 HEAD cozy-etcd 0.1.1 HEAD -cozy-monitoring 0.1.0 HEAD cozy-grafana-oncall 0.1.0 HEAD +cozy-ingress 1.0.0 HEAD +cozy-monitoring 0.1.0 HEAD diff --git a/packages/system/ingress-nginx/Chart.yaml b/packages/system/ingress-nginx/Chart.yaml deleted file mode 100644 index 4716918b..00000000 --- a/packages/system/ingress-nginx/Chart.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: cozy-ingress-nginx -version: 1.0.0 diff --git a/packages/system/kamaji/Makefile b/packages/system/kamaji/Makefile index 46064e7d..79e6787c 100644 --- a/packages/system/kamaji/Makefile +++ b/packages/system/kamaji/Makefile @@ -5,6 +5,7 @@ show: helm template --dry-run=server -n $(NAMESPACE) $(NAME) . apply: + flux suspend hr kamaji -n cozy-kamaji || true helm upgrade -i -n $(NAMESPACE) $(NAME) . diff: diff --git a/packages/system/kamaji/charts/kamaji/Chart.yaml b/packages/system/kamaji/charts/kamaji/Chart.yaml index 4eb0fdfc..f2fb9252 100644 --- a/packages/system/kamaji/charts/kamaji/Chart.yaml +++ b/packages/system/kamaji/charts/kamaji/Chart.yaml @@ -3,7 +3,7 @@ annotations: catalog.cattle.io/display-name: Kamaji catalog.cattle.io/release-name: kamaji apiVersion: v2 -appVersion: v0.4.0 +appVersion: v0.4.1 description: Kamaji is a Kubernetes Control Plane Manager. home: https://github.com/clastix/kamaji icon: https://github.com/clastix/kamaji/raw/master/assets/logo-colored.png @@ -19,4 +19,4 @@ name: kamaji sources: - https://github.com/clastix/kamaji type: application -version: 0.14.0 +version: 0.14.1 diff --git a/packages/system/kamaji/charts/kamaji/README.md b/packages/system/kamaji/charts/kamaji/README.md index 8a79a014..70e77a0b 100644 --- a/packages/system/kamaji/charts/kamaji/README.md +++ b/packages/system/kamaji/charts/kamaji/README.md @@ -1,6 +1,6 @@ # kamaji -![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.0](https://img.shields.io/badge/AppVersion-v0.4.0-informational?style=flat-square) +![Version: 0.14.1](https://img.shields.io/badge/Version-0.14.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v0.4.1](https://img.shields.io/badge/AppVersion-v0.4.1-informational?style=flat-square) Kamaji is a Kubernetes Control Plane Manager. diff --git a/packages/system/metallb-addresses/Chart.yaml b/packages/system/metallb-addresses/Chart.yaml deleted file mode 100644 index 95b4a6d3..00000000 --- a/packages/system/metallb-addresses/Chart.yaml +++ /dev/null @@ -1,2 +0,0 @@ -name: cozy-metallb-addresses -version: 1.0.0 diff --git a/packages/system/metallb-addresses/Makefile b/packages/system/metallb-addresses/Makefile deleted file mode 100644 index aba18ca8..00000000 --- a/packages/system/metallb-addresses/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -NAME=metallb-addresses -NAMESPACE=cozy-metallb - -show: - helm template --dry-run=server -n $(NAMESPACE) $(NAME) . - -apply: - helm upgrade -i -n $(NAMESPACE) $(NAME) . - -diff: - helm diff upgrade --allow-unreleased --normalize-manifests -n $(NAMESPACE) $(NAME) .