From 2e43329d8858d28319a6c80e097b04b5bc8a893e Mon Sep 17 00:00:00 2001 From: Stefan Matting Date: Tue, 30 Apr 2024 17:27:00 +0200 Subject: [PATCH] Remove inbucket Helm chart --- Makefile | 2 +- changelog.d/5-internal/remove-inbucket | 1 + charts/inbucket/Chart.yaml | 10 ---- charts/inbucket/README.md | 10 ---- charts/inbucket/requirements.yaml | 4 -- charts/inbucket/templates/_helpers.tpl | 30 ------------ .../inbucket/templates/basic-auth-secret.yaml | 15 ------ charts/inbucket/templates/cert.yaml | 28 ----------- charts/inbucket/templates/ingress.yaml | 48 ------------------- charts/inbucket/values.yaml | 25 ---------- 10 files changed, 2 insertions(+), 171 deletions(-) create mode 100644 changelog.d/5-internal/remove-inbucket delete mode 100644 charts/inbucket/Chart.yaml delete mode 100644 charts/inbucket/README.md delete mode 100644 charts/inbucket/requirements.yaml delete mode 100644 charts/inbucket/templates/_helpers.tpl delete mode 100644 charts/inbucket/templates/basic-auth-secret.yaml delete mode 100644 charts/inbucket/templates/cert.yaml delete mode 100644 charts/inbucket/templates/ingress.yaml delete mode 100644 charts/inbucket/values.yaml diff --git a/Makefile b/Makefile index 0ffa86792f2..f34ffcdb77a 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ fake-aws fake-aws-s3 fake-aws-sqs aws-ingress fluent-bit kibana backoffice \ calling-test demo-smtp elasticsearch-curator elasticsearch-external \ elasticsearch-ephemeral minio-external cassandra-external \ nginx-ingress-controller ingress-nginx-controller nginx-ingress-services reaper restund coturn \ -inbucket k8ssandra-test-cluster postgresql ldap-scim-bridge smallstep-accomp +k8ssandra-test-cluster postgresql ldap-scim-bridge smallstep-accomp KIND_CLUSTER_NAME := wire-server HELM_PARALLELISM ?= 1 # 1 for sequential tests; 6 for all-parallel tests diff --git a/changelog.d/5-internal/remove-inbucket b/changelog.d/5-internal/remove-inbucket new file mode 100644 index 00000000000..d4a77b0fc3d --- /dev/null +++ b/changelog.d/5-internal/remove-inbucket @@ -0,0 +1 @@ +Remove inbucket helm chart. diff --git a/charts/inbucket/Chart.yaml b/charts/inbucket/Chart.yaml deleted file mode 100644 index 9c440f0ab9d..00000000000 --- a/charts/inbucket/Chart.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -name: inbucket -version: 0.0.42 -description: Inbucket is an email testing application; it will accept messages for any email address and make them available to view via a web interface. -home: https://www.inbucket.org/ -sources: - - https://github.com/inbucket/inbucket - - https://artifacthub.io/packages/helm/inbucket/inbucket - - https://hub.docker.com/r/inbucket/inbucket -appVersion: 3.0.0 diff --git a/charts/inbucket/README.md b/charts/inbucket/README.md deleted file mode 100644 index 8fd97254a2d..00000000000 --- a/charts/inbucket/README.md +++ /dev/null @@ -1,10 +0,0 @@ -# Inbucket chart - -[*Inbucket*](https://www.inbucket.org/) is a fake SMTP server that provides all -captured eMails via a webapp and a REST API. At *Wire* it is used in testing -environments to not have to deal with concrete SMTP server configurations. -Especially, it saves us to care about topics like *SPAM filters* and *server -grey & black listing*. - -This chart exists to adjust the [`inbucket/inbucket` -chart](https://artifacthub.io/packages/helm/inbucket/inbucket) to our needs. diff --git a/charts/inbucket/requirements.yaml b/charts/inbucket/requirements.yaml deleted file mode 100644 index 47adf720b7d..00000000000 --- a/charts/inbucket/requirements.yaml +++ /dev/null @@ -1,4 +0,0 @@ -dependencies: -- name: inbucket - version: 2.1.0 - repository: https://inbucket.github.io/inbucket-community diff --git a/charts/inbucket/templates/_helpers.tpl b/charts/inbucket/templates/_helpers.tpl deleted file mode 100644 index da39aad074a..00000000000 --- a/charts/inbucket/templates/_helpers.tpl +++ /dev/null @@ -1,30 +0,0 @@ -{{/* Allow KubeVersion to be overridden. */}} -{{- define "kubeVersion" -}} - {{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride -}} -{{- end -}} - -{{/* Get Ingress API Version */}} -{{- define "ingress.apiVersion" -}} - {{- if and (.Capabilities.APIVersions.Has "networking.k8s.io/v1") (semverCompare ">= 1.19-0" (include "kubeVersion" .)) -}} - {{- print "networking.k8s.io/v1" -}} - {{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" -}} - {{- print "networking.k8s.io/v1beta1" -}} - {{- else -}} - {{- print "extensions/v1beta1" -}} - {{- end -}} -{{- end -}} - -{{/* Check Ingress stability */}} -{{- define "ingress.isStable" -}} - {{- eq (include "ingress.apiVersion" .) "networking.k8s.io/v1" -}} -{{- end -}} - -{{/* Check Ingress supports pathType */}} -{{/* pathType was added to networking.k8s.io/v1beta1 in Kubernetes 1.18 */}} -{{- define "ingress.supportsPathType" -}} - {{- or (eq (include "ingress.isStable" .) "true") (and (eq (include "ingress.apiVersion" .) "networking.k8s.io/v1beta1") (semverCompare ">= 1.18-0" (include "kubeVersion" .))) -}} -{{- end -}} - -{{- define "ingress.FieldNotAnnotation" -}} - {{- (semverCompare ">= 1.27-0" (include "kubeVersion" .)) -}} -{{- end -}} diff --git a/charts/inbucket/templates/basic-auth-secret.yaml b/charts/inbucket/templates/basic-auth-secret.yaml deleted file mode 100644 index 9918cbb7163..00000000000 --- a/charts/inbucket/templates/basic-auth-secret.yaml +++ /dev/null @@ -1,15 +0,0 @@ -{{- if (hasKey .Values "basicAuthSecret") }} -apiVersion: v1 -kind: Secret -metadata: - name: inbucket-basic-auth - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: {{ include "inbucket.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ include "inbucket.chart" . }} -type: Opaque -data: - auth: {{ .Values.basicAuthSecret | b64enc | quote }} -{{- end }} diff --git a/charts/inbucket/templates/cert.yaml b/charts/inbucket/templates/cert.yaml deleted file mode 100644 index 7a0aeb7bd63..00000000000 --- a/charts/inbucket/templates/cert.yaml +++ /dev/null @@ -1,28 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: "letsencrypt-inbucket-csr" - namespace: {{ .Release.Namespace }} - labels: - chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" - release: "{{ .Release.Name }}" - heritage: "{{ .Release.Service }}" -spec: - issuerRef: - {{- toYaml .Values.issuerRef | nindent 4 }} - - usages: - - server auth - duration: 2160h # 90d, Letsencrypt default; NOTE: changes are ignored by Letsencrypt - renewBefore: 360h # 15d - isCA: false - secretName: letsencrypt-inbucket-secret - - privateKey: - algorithm: ECDSA - size: 384 # 521 is not supported by Letsencrypt - encoding: PKCS1 - rotationPolicy: Always - - dnsNames: - - {{ .Values.host }} diff --git a/charts/inbucket/templates/ingress.yaml b/charts/inbucket/templates/ingress.yaml deleted file mode 100644 index 77c30a7df1a..00000000000 --- a/charts/inbucket/templates/ingress.yaml +++ /dev/null @@ -1,48 +0,0 @@ -{{- $apiIsStable := eq (include "ingress.isStable" .) "true" -}} -{{- $ingressFieldNotAnnotation := eq (include "ingress.FieldNotAnnotation" .) "true" -}} -{{- $ingressSupportsPathType := eq (include "ingress.supportsPathType" .) "true" -}} -apiVersion: {{ include "ingress.apiVersion" . }} -kind: Ingress -metadata: - name: "inbucket" - namespace: {{ .Release.Namespace }} - labels: - app.kubernetes.io/name: {{ include "inbucket.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - helm.sh/chart: {{ include "inbucket.chart" . }} - annotations: - {{- if not $ingressFieldNotAnnotation }} - kubernetes.io/ingress.class: "{{ .Values.config.ingressClass }}" - {{- end }} -{{- if (hasKey .Values "basicAuthSecret") }} - nginx.ingress.kubernetes.io/auth-type: basic - nginx.ingress.kubernetes.io/auth-secret: inbucket-basic-auth - nginx.ingress.kubernetes.io/auth-realm: 'Authentication Required - inbucket' -{{- end }} -spec: - {{- if $ingressFieldNotAnnotation }} - ingressClassName: "{{ .Values.config.ingressClass }}" - {{- end }} - tls: - - hosts: - - {{ required "must specify host" .Values.host | quote }} - secretName: letsencrypt-inbucket-secret - rules: - - host: {{ required "must specify host" .Values.host | quote }} - http: - paths: - - path: / - {{- if $ingressSupportsPathType }} - pathType: Prefix - {{- end }} - backend: - {{- if $apiIsStable }} - service: - name: {{ include "inbucket.fullname" . }} - port: - name: http - {{- else }} - serviceName: {{ include "inbucket.fullname" . }} - servicePort: http - {{- end }} diff --git a/charts/inbucket/values.yaml b/charts/inbucket/values.yaml deleted file mode 100644 index 14511177c4e..00000000000 --- a/charts/inbucket/values.yaml +++ /dev/null @@ -1,25 +0,0 @@ -# Fully qualified domain name (FQDN) of the domain where to serve inbucket. -# E.g. 'inbucket.my-test-env.wire.link' -host: "inbucket.wire.example" - -config: - ingressClass: "nginx" - -# Configure the inbucket "parent" chart -inbucket: - image: - tag: 3.0.2 - - extraEnv: - INBUCKET_WEB_GREETINGFILE: "/config/greeting.html" - INBUCKET_MAILBOXNAMING: full - INBUCKET_STORAGE_RETENTIONPERIOD: "72h" - -# issuerRef: -# kind: ClusterIssuer -# name: letsencrypt - -# Enables and configures HTTP Basic Auth secret as e.g. created with -# `htpasswd -bc auth username password`. -# -# basicAuthSecret: username:$apr1$3jXFMMZX$z6OOf4eUn1wU.NYJt246u1