From ab988a2e3cf154b5c8a531ede68681d12130ca20 Mon Sep 17 00:00:00 2001 From: QuentinBisson Date: Tue, 9 Apr 2024 15:40:58 +0200 Subject: [PATCH] Remove basic auth --- CHANGELOG.md | 4 ++ .../templates/ingress-basic-auth.yaml | 53 ------------------- helm/promxy-app/templates/secret.yaml | 8 --- helm/promxy-app/values.schema.json | 8 --- helm/promxy-app/values.yaml | 2 - 5 files changed, 4 insertions(+), 71 deletions(-) delete mode 100644 helm/promxy-app/templates/ingress-basic-auth.yaml delete mode 100644 helm/promxy-app/templates/secret.yaml diff --git a/CHANGELOG.md b/CHANGELOG.md index 07a0f62..8bd47d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Removed + +- Remove basic auth ingress because central promxy is not a thing. + ## [1.23.0] - 2024-01-23 ### Added diff --git a/helm/promxy-app/templates/ingress-basic-auth.yaml b/helm/promxy-app/templates/ingress-basic-auth.yaml deleted file mode 100644 index d5ec6bb..0000000 --- a/helm/promxy-app/templates/ingress-basic-auth.yaml +++ /dev/null @@ -1,53 +0,0 @@ -{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} -apiVersion: networking.k8s.io/v1 -{{- else }} -apiVersion: networking.k8s.io/v1beta1 -{{- end }} -kind: Ingress -metadata: - name: {{ include "resource.default.name" . }}-basic-auth - namespace: {{ include "resource.default.namespace" . }} - annotations: - {{- if .Values.monitoring.prometheus.letsencrypt }} - kubernetes.io/tls-acme: "true" - {{- with .Values.monitoring.prometheus.clusterIssuerName }} - cert-manager.io/cluster-issuer: "{{ . }}" - {{- end }} - {{- end }} - nginx.ingress.kubernetes.io/rewrite-target: /$2 - # basic-auth for global Promxy to be able to access all installation-level - # Promxies - nginx.ingress.kubernetes.io/auth-type: basic - nginx.ingress.kubernetes.io/auth-secret: {{ include "resource.default.name" . }} - nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required' - {{- if .Values.security.restrictAccess.enabled }} - nginx.ingress.kubernetes.io/whitelist-source-range: "{{ .Values.security.subnet.vpn }}" - {{- end }} - {{- if .Values.ingress.externalDNS }} - external-dns.alpha.kubernetes.io/hostname: {{ .Values.monitoring.prometheus.host }} - giantswarm.io/external-dns: managed - {{- end }} - labels: - {{- include "labels.common" . | nindent 4 }} -spec: - ingressClassName: nginx - rules: - - host: {{ .Values.monitoring.prometheus.host }} - http: - paths: - - path: /promxy(/|$)(.*) - pathType: ImplementationSpecific - backend: -{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress" }} - service: - name: {{ include "resource.default.name" . }} - port: - number: {{ .Values.promxy.port }} -{{- else }} - serviceName: {{ include "resource.default.name" . }} - servicePort: {{ .Values.promxy.port }} -{{- end }} - tls: - - hosts: - - {{ .Values.monitoring.prometheus.host }} - secretName: prometheus-tls diff --git a/helm/promxy-app/templates/secret.yaml b/helm/promxy-app/templates/secret.yaml deleted file mode 100644 index a596371..0000000 --- a/helm/promxy-app/templates/secret.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: {{ include "resource.default.name" . }} - namespace: {{ include "resource.default.namespace" . }} -data: - auth: {{ .Values.monitoring.promxy.htpasswd }} -type: Opaque diff --git a/helm/promxy-app/values.schema.json b/helm/promxy-app/values.schema.json index b7a5123..3cd0cf3 100644 --- a/helm/promxy-app/values.schema.json +++ b/helm/promxy-app/values.schema.json @@ -58,14 +58,6 @@ "type": "boolean" } } - }, - "promxy": { - "type": "object", - "properties": { - "htpasswd": { - "type": "string" - } - } } } }, diff --git a/helm/promxy-app/values.yaml b/helm/promxy-app/values.yaml index 64168cc..1610110 100644 --- a/helm/promxy-app/values.yaml +++ b/helm/promxy-app/values.yaml @@ -15,8 +15,6 @@ monitoring: host: "" letsencrypt: true clusterIssuerName: "" - promxy: - htpasswd: "" pod: user: