From c07fecd20b3e1a0422580ae176678f4f8c17158d Mon Sep 17 00:00:00 2001 From: instamenta Date: Thu, 19 Dec 2024 15:20:23 +0200 Subject: [PATCH] removed code related to moved files and dependencies Signed-off-by: instamenta --- chart/Chart.yaml | 9 ----- .../cert-manager/certificate-requests.yaml | 26 ------------ .../cert-manager/cluster-issuer.yaml | 12 ------ chart/templates/ingress/ingress-class.yaml | 8 ---- chart/values.yaml | 40 ------------------- 5 files changed, 95 deletions(-) delete mode 100644 chart/templates/cert-manager/certificate-requests.yaml delete mode 100644 chart/templates/cert-manager/cluster-issuer.yaml delete mode 100644 chart/templates/ingress/ingress-class.yaml diff --git a/chart/Chart.yaml b/chart/Chart.yaml index f29bfbc62..c033fe7d5 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -6,12 +6,3 @@ name: hiero-explorer sources: - https://github.com/hashgraph/hedera-mirror-node-explorer version: 0.2.1 -dependencies: - - name: acme-cluster-issuer - version: 0.3.1 - repository: https://swirldslabs.github.io/swirldslabs-helm-charts - condition: acmeClusterIssuer.enabled - - name: haproxy-ingress - version: 0.14.5 - repository: https://haproxy-ingress.github.io/charts - condition: haproxyIngressController.enabled diff --git a/chart/templates/cert-manager/certificate-requests.yaml b/chart/templates/cert-manager/certificate-requests.yaml deleted file mode 100644 index b8314d3e7..000000000 --- a/chart/templates/cert-manager/certificate-requests.yaml +++ /dev/null @@ -1,26 +0,0 @@ -{{- if or $.Values.selfSignedClusterIssuer.enabled (index $.Values "certClusterIssuerType" | ne "self-signed" ) }} -apiVersion: cert-manager.io/v1 -kind: Certificate -metadata: - name: ca-secret-hiero-explorer - namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }} -spec: - isCA: false - commonName: {{ index $.Values "ingress" "hosts" 0 "host" }} - dnsNames: - - {{ index $.Values "ingress" "hosts" 0 "host" }} - secretName: ca-secret-hiero-explorer - privateKey: - algorithm: RSA - size: 3072 - issuerRef: - {{- if index .Values "certClusterIssuerType" | eq "self-signed"}} - name: {{ tpl (index .Values "selfSignedCertClusterIssuer") . }} - {{- else if index .Values "certClusterIssuerType" | eq "acme-staging" }} - name: {{ tpl (index .Values "acme-cluster-issuer" "issuers" "staging" "name") . }} - {{- else if index .Values "certClusterIssuerType" | eq "acme-prod" }} - name: {{ tpl (index .Values "acme-cluster-issuer" "issuers" "production" "name") . }} - {{- end }} - kind: ClusterIssuer - group: cert-manager.io -{{- end }} diff --git a/chart/templates/cert-manager/cluster-issuer.yaml b/chart/templates/cert-manager/cluster-issuer.yaml deleted file mode 100644 index 6bc684852..000000000 --- a/chart/templates/cert-manager/cluster-issuer.yaml +++ /dev/null @@ -1,12 +0,0 @@ -{{- if $.Values.selfSignedClusterIssuer.enabled }} -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer -metadata: - name: {{ tpl (index .Values.selfSignedCertClusterIssuer) . }} - namespace: cert-manager - annotations: - helm.sh/hook: post-install - helm.sh/hook-weight: "2" -spec: - selfSigned: {} -{{- end }} \ No newline at end of file diff --git a/chart/templates/ingress/ingress-class.yaml b/chart/templates/ingress/ingress-class.yaml deleted file mode 100644 index 305bde4f4..000000000 --- a/chart/templates/ingress/ingress-class.yaml +++ /dev/null @@ -1,8 +0,0 @@ -{{- if $.Values.haproxyIngressController.enabled }} -apiVersion: networking.k8s.io/v1 -kind: IngressClass -metadata: - name: {{ .Values.ingressClassName }} -spec: - controller: haproxy-ingress.github.io/controller -{{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index 6d18d373c..14d00f0a2 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -1,29 +1,3 @@ -selfSignedCertClusterIssuer: '{{ .Values.global.namespaceOverride | default .Release.Namespace | printf "%s-self-signed-cluster-issuer" }}' -certClusterIssuerType: "self-signed" # "acme-staging", "acme-prod", or "self-signed" -ingressClassName: "" # if set, takes precedence over the .Values.ingress.className -acmeClusterIssuer: - enabled: false -haproxyIngressController: - enabled: false -selfSignedClusterIssuer: - enabled: false - -# lets encrypt acme cluster issuer configuration -acme-cluster-issuer: - issuers: - staging: - email: "" - name: '{{ .Values.global.namespaceOverride | default .Release.Namespace | printf "%s-letsencrypt-staging" }}' - production: - email: "" - name: '{{ .Values.global.namespaceOverride | default .Release.Namespace | printf "%s-letsencrypt-prod" }}' - solvers: # TODO change in: https://github.com/hashgraph/full-stack-testing/issues/631 - http01: - solverType: "ingress" -haproxy-ingress: - controller: - service: - loadBalancerIP: "" # the external IP address of the hedera mirror node explorer affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: @@ -75,20 +49,6 @@ image: repository: hedera-registry/hedera-mirror-node-explorer tag: "" # Defaults to the chart's app version -ingress: - annotations: {} - className: "" - enabled: false - hosts: - - host: chart-example.local - paths: - - path: / - pathType: ImplementationSpecific - tls: [] - # - secretName: chart-example-tls - # hosts: - # - chart-example.local - labels: {} livenessProbe: