From 69081823676860ae2b589cefaa41cf61dc156220 Mon Sep 17 00:00:00 2001 From: Richard Robert Reitz Date: Wed, 7 May 2025 16:44:39 +0200 Subject: [PATCH] feat(otc): Moved ingress-nginx to otc stack, removed KIND stuff and added OTC annotations --- .../stacks/core/ingress-nginx/values.yaml | 49 ------------------- .../stacks/{core => otc}/ingress-nginx.yaml | 0 template/stacks/otc/ingress-nginx/values.yaml | 38 ++++++++++++++ 3 files changed, 38 insertions(+), 49 deletions(-) delete mode 100644 template/stacks/core/ingress-nginx/values.yaml rename template/stacks/{core => otc}/ingress-nginx.yaml (100%) create mode 100644 template/stacks/otc/ingress-nginx/values.yaml diff --git a/template/stacks/core/ingress-nginx/values.yaml b/template/stacks/core/ingress-nginx/values.yaml deleted file mode 100644 index 7bb7aa2..0000000 --- a/template/stacks/core/ingress-nginx/values.yaml +++ /dev/null @@ -1,49 +0,0 @@ -controller: - updateStrategy: - type: RollingUpdate - rollingUpdate: - maxUnavailable: 1 - - ingressClassResource: - name: nginx - - # added for idpbuilder - allowSnippetAnnotations: true - - # added for idpbuilder - config: - proxy-buffer-size: 32k - use-forwarded-headers: "true" - - # monitoring nginx - metrics: - enabled: true - serviceMonitor: - additionalLabels: - release: "ingress-nginx" - enabled: true - -{{{ if eq .Env.CLUSTER_TYPE "kind" }}} - hostPort: - enabled: true - terminationGracePeriodSeconds: 0 - service: - type: NodePort - - nodeSelector: - ingress-ready: "true" - tolerations: - - key: "node-role.kubernetes.io/master" - operator: "Equal" - effect: "NoSchedule" - - key: "node-role.kubernetes.io/control-plane" - operator: "Equal" - effect: "NoSchedule" - - publishService: - enabled: false - extraArgs: - publish-status-address: localhost - # added for idpbuilder - enable-ssl-passthrough: "" -{{{ end }}} diff --git a/template/stacks/core/ingress-nginx.yaml b/template/stacks/otc/ingress-nginx.yaml similarity index 100% rename from template/stacks/core/ingress-nginx.yaml rename to template/stacks/otc/ingress-nginx.yaml diff --git a/template/stacks/otc/ingress-nginx/values.yaml b/template/stacks/otc/ingress-nginx/values.yaml new file mode 100644 index 0000000..2546eb1 --- /dev/null +++ b/template/stacks/otc/ingress-nginx/values.yaml @@ -0,0 +1,38 @@ +controller: + updateStrategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 1 + + service: + annotations: + kubernetes.io/elb.class: union + kubernetes.io/elb.port: '80' + kubernetes.io/elb.autocreate: + '{ + "type":"public", + "bandwidth_name":"cce-bandwidth-test, + "bandwidth_chargemode":"traffic", + "bandwidth_size":1000, + "bandwidth_sharetype":"PER", + "eip_type":"5_bgp" + }' + + ingressClassResource: + name: nginx + + # added for idpbuilder + allowSnippetAnnotations: true + + # added for idpbuilder + config: + proxy-buffer-size: 32k + use-forwarded-headers: "true" + + # monitoring nginx + metrics: + enabled: true + serviceMonitor: + additionalLabels: + release: "ingress-nginx" + enabled: true