rob/netflux-kubernetes
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Revert ingress-nginx installation. k3s bundles Traefik.

Browse Source 
This reverts commit 31de4c739d50d2ec0d4c29ec3b043ea2dd83250a.
This commit is contained in:
Rob Watson 2025-04-26 12:29:22 +02:00
parent 1f04e6c630
commit 244b887c1a
26 changed files with 20 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
deploy/minimal-base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml → deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml → deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml → deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml → deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml → deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml → deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml → deploy/base/inflated/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml → deploy/base/inflated/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/clusterrole.yaml → deploy/base/inflated/ingress-nginx/templates/clusterrole.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/clusterrolebinding.yaml → deploy/base/inflated/ingress-nginx/templates/clusterrolebinding.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-configmap.yaml → deploy/base/inflated/ingress-nginx/templates/controller-configmap.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-deployment.yaml → deploy/base/inflated/ingress-nginx/templates/controller-deployment.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-ingressclass.yaml → deploy/base/inflated/ingress-nginx/templates/controller-ingressclass.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-poddisruptionbudget.yaml → deploy/base/inflated/ingress-nginx/templates/controller-poddisruptionbudget.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-role.yaml → deploy/base/inflated/ingress-nginx/templates/controller-role.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-rolebinding.yaml → deploy/base/inflated/ingress-nginx/templates/controller-rolebinding.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-service-metrics.yaml → deploy/base/inflated/ingress-nginx/templates/controller-service-metrics.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-service-webhook.yaml → deploy/base/inflated/ingress-nginx/templates/controller-service-webhook.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-service.yaml → deploy/base/inflated/ingress-nginx/templates/controller-service.yaml
View File

0
deploy/minimal-base/inflated/ingress-nginx/templates/controller-serviceaccount.yaml → deploy/base/inflated/ingress-nginx/templates/controller-serviceaccount.yaml
View File

20
deploy/base/kustomization.yaml
View File

@ -1,6 +1,26 @@
---
resources:
- ../minimal-base
# ingress-nginx
- inflated/ingress-nginx/templates/controller-deployment.yaml
- inflated/ingress-nginx/templates/controller-serviceaccount.yaml
- inflated/ingress-nginx/templates/controller-rolebinding.yaml
- inflated/ingress-nginx/templates/controller-ingressclass.yaml
- inflated/ingress-nginx/templates/controller-service-metrics.yaml
- inflated/ingress-nginx/templates/clusterrole.yaml
- inflated/ingress-nginx/templates/controller-service.yaml
- inflated/ingress-nginx/templates/controller-service-webhook.yaml
- inflated/ingress-nginx/templates/controller-role.yaml
- inflated/ingress-nginx/templates/controller-configmap.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
- inflated/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
- inflated/ingress-nginx/templates/clusterrolebinding.yaml
# Prometheus
- inflated/prometheus/charts/prometheus-node-exporter/templates/daemonset.yaml
- inflated/prometheus/charts/prometheus-node-exporter/templates/serviceaccount.yaml

20
deploy/minimal-base/kustomization.yaml
View File

@ -11,23 +11,3 @@ resources:
- inflated/metrics-server/templates/service.yaml
- inflated/metrics-server/templates/clusterrole.yaml
- inflated/metrics-server/templates/clusterrolebinding.yaml
# ingress-nginx
- inflated/ingress-nginx/templates/controller-deployment.yaml
- inflated/ingress-nginx/templates/controller-serviceaccount.yaml
- inflated/ingress-nginx/templates/controller-rolebinding.yaml
- inflated/ingress-nginx/templates/controller-ingressclass.yaml
- inflated/ingress-nginx/templates/controller-service-metrics.yaml
- inflated/ingress-nginx/templates/clusterrole.yaml
- inflated/ingress-nginx/templates/controller-service.yaml
- inflated/ingress-nginx/templates/controller-service-webhook.yaml
- inflated/ingress-nginx/templates/controller-role.yaml
- inflated/ingress-nginx/templates/controller-configmap.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/serviceaccount.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-createSecret.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/rolebinding.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/role.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrole.yaml
- inflated/ingress-nginx/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
- inflated/ingress-nginx/templates/admission-webhooks/validating-webhook.yaml
- inflated/ingress-nginx/templates/clusterrolebinding.yaml

16
deploy/prod-ovh/deploy-ingress-nginx.yaml
View File

@ -1,16 +0,0 @@
---
- op: replace
path: /spec/template/spec/containers/0/args/1
value: "--publish-service=$(POD_NAMESPACE)/prod-ingress-nginx-controller"
- op: replace
path: /spec/template/spec/containers/0/args/5
value: "--configmap=$(POD_NAMESPACE)/prod-ingress-nginx-controller"
- op: add
path: /spec/template/spec/containers/0/args/-
value: "--tcp-services-configmap=$(POD_NAMESPACE)/prod-ingress-nginx-tcp-services"
- op: add
path: /spec/template/spec/containers/0/args/-
value: "--default-ssl-certificate=$(POD_NAMESPACE)/prod-ingress-tls"
- op: replace
path: /spec/template/spec/volumes/0/secret/secretName
value: prod-ingress-nginx-admission

7
deploy/prod-ovh/job-ingress-nginx-admission-create.yaml
View File

@ -1,7 +0,0 @@
---
- op: replace
path: /spec/template/spec/containers/0/args/1
value: "--host=prod-ingress-nginx-controller-admission,prod-ingress-nginx-controller-admission.$(POD_NAMESPACE).svc"
- op: replace
path: /spec/template/spec/containers/0/args/3
value: "--secret-name=prod-ingress-nginx-admission"

7
deploy/prod-ovh/job-ingress-nginx-admission-patch.yaml
View File

@ -1,7 +0,0 @@
---
- op: replace
path: /spec/template/spec/containers/0/args/1
value: "--webhook-name=prod-ingress-nginx-admission"
- op: replace
path: /spec/template/spec/containers/0/args/4
value: "--secret-name=prod-ingress-nginx-admission"

22
deploy/prod-ovh/kustomization.yaml
View File

@ -21,25 +21,3 @@ resources:
- inflated/cert-manager/templates/rbac.yaml
- inflated/cert-manager/templates/startupapicheck-job.yaml
- inflated/cert-manager/templates/webhook-deployment.yaml
patches:
# Patch the ingress-nginx deployment to allow it to use a service with a
# namePrefix. See https://github.com/kubernetes/ingress-nginx/issues/2599#issuecomment-601170289.
- target:
kind: Deployment
name: ingress-nginx-controller
path: deploy-ingress-nginx.yaml
# Patch the ingress-nginx-admission-create job to reference its webhook with a
# namePrefix.
- target:
kind: Job
name: ingress-nginx-admission-create
path: job-ingress-nginx-admission-create.yaml
# Patch the ingress-nginx-admission-patch job to reference its webhook with a
# namePrefix.
- target:
kind: Job
name: ingress-nginx-admission-patch
path: job-ingress-nginx-admission-patch.yaml