diff --git a/charts/fullstack-deployment/Chart.lock b/charts/fullstack-deployment/Chart.lock index f9aaaec04..6f23134b2 100644 --- a/charts/fullstack-deployment/Chart.lock +++ b/charts/fullstack-deployment/Chart.lock @@ -9,10 +9,10 @@ dependencies: repository: https://operator.min.io/ version: 5.0.7 - name: acme-cluster-issuer - repository: "" - version: 0.3.0 + repository: https://swirldslabs.github.io/swirldslabs-helm-charts + version: 0.3.1 - name: haproxy-ingress repository: https://haproxy-ingress.github.io/charts version: 0.14.5 -digest: sha256:08303f21e82e6b77a39f6018638b5ba10f180ae420422296bbc5ddcd9f257c4a -generated: "2024-01-18T13:48:57.467807Z" +digest: sha256:a895d9b9235e22a469f2b274650fa25e2c7fd586eff205bfa473bdfd4cfd0f91 +generated: "2024-01-24T16:36:12.619906Z" diff --git a/charts/fullstack-deployment/Chart.yaml b/charts/fullstack-deployment/Chart.yaml index 7e1f086e2..4954630fc 100644 --- a/charts/fullstack-deployment/Chart.yaml +++ b/charts/fullstack-deployment/Chart.yaml @@ -49,9 +49,8 @@ dependencies: condition: cloud.minio.enabled - name: acme-cluster-issuer - version: 0.3.0 - # TODO uncomment #repository: https://swirldslabs.github.io/swirldslabs-helm-charts - # TODO once source chart has been updated: https://github.com/hashgraph/full-stack-testing/issues/635 + version: 0.3.1 + repository: https://swirldslabs.github.io/swirldslabs-helm-charts condition: cloud.acmeClusterIssuer.enabled - name: haproxy-ingress diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/.helmignore b/charts/fullstack-deployment/charts/acme-cluster-issuer/.helmignore deleted file mode 100644 index 0e8a0eb36..000000000 --- a/charts/fullstack-deployment/charts/acme-cluster-issuer/.helmignore +++ /dev/null @@ -1,23 +0,0 @@ -# Patterns to ignore when building packages. -# This supports shell glob matching, relative path matching, and -# negation (prefixed with !). Only one pattern per line. -.DS_Store -# Common VCS dirs -.git/ -.gitignore -.bzr/ -.bzrignore -.hg/ -.hgignore -.svn/ -# Common backup files -*.swp -*.bak -*.tmp -*.orig -*~ -# Various IDEs -.project -.idea/ -*.tmproj -.vscode/ diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/Chart.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/Chart.yaml deleted file mode 100644 index b9d4b05da..000000000 --- a/charts/fullstack-deployment/charts/acme-cluster-issuer/Chart.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v2 -appVersion: 1.10.1 -description: 'Deploys a production/staging pair of ACME cert-manager cluster issuer - into a Kubernetes cluster. Cert-Manager must already be installed and running prior - to this chart being installed. ' -name: acme-cluster-issuer -type: application -version: 0.3.0 diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/production.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/production.yaml deleted file mode 100644 index 40c5993eb..000000000 --- a/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/production.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer -metadata: - name: {{ tpl .Values.issuers.production.name $ }} - namespace: cert-manager - {{- with .Values.issuers.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - acme: - server: https://acme-v02.api.letsencrypt.org/directory - email: {{ .Values.issuers.production.email }} - privateKeySecretRef: - name: {{ tpl .Values.issuers.production.name $ }} - solvers: - {{- if .Values.solvers.http01.enabled }} - - http01: - {{- if .Values.solvers.http01.solverType | eq "ingress" }} - ingress: - {{- with .Values.solvers.http01.ingress }} - {{- with .name }} - name: {{ . }} - {{- end }} - {{- with .class }} - class: {{ . }} - {{- end }} - {{- with $.Values.global.ingressClassName }} - ingressClassName: {{ . }} - {{- end }} - serviceType: {{ .serviceType }} - {{- end }} - {{- end }} - {{- if .Values.solvers.http01.solverType | eq "gatewayHTTPRoute" }} - gatewayHTTPRoute: - {{- with .Values.solvers.http01.gatewayHTTPRoute }} - parentRefs: - - name: {{ .name }} - namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }} - kind: Gateway - {{- end }} - {{- end }} - {{- end }} diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/staging.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/staging.yaml deleted file mode 100644 index f6bb2aeaf..000000000 --- a/charts/fullstack-deployment/charts/acme-cluster-issuer/templates/staging.yaml +++ /dev/null @@ -1,43 +0,0 @@ -apiVersion: cert-manager.io/v1 -kind: ClusterIssuer -metadata: - name: {{ tpl .Values.issuers.staging.name $ }} - namespace: cert-manager - {{- with .Values.issuers.annotations }} - annotations: - {{- toYaml . | nindent 4 }} - {{- end }} -spec: - acme: - server: https://acme-staging-v02.api.letsencrypt.org/directory - email: {{ .Values.issuers.staging.email }} - privateKeySecretRef: - name: {{ tpl .Values.issuers.staging.name $ }} - solvers: - {{- if .Values.solvers.http01.enabled }} - - http01: - {{- if .Values.solvers.http01.solverType | eq "ingress" }} - ingress: - {{- with .Values.solvers.http01.ingress }} - {{- with .name }} - name: {{ . }} - {{- end }} - {{- with .class }} - class: {{ . }} - {{- end }} - {{- with $.Values.global.ingressClassName }} - ingressClassName: {{ . }} - {{- end }} - serviceType: {{ .serviceType }} - {{- end }} - {{- end }} - {{- if .Values.solvers.http01.solverType | eq "gatewayHTTPRoute" }} - gatewayHTTPRoute: - {{- with .Values.solvers.http01.gatewayHTTPRoute }} - parentRefs: - - name: {{ .name }} - namespace: {{ default $.Release.Namespace $.Values.global.namespaceOverride }} - kind: Gateway - {{- end }} - {{- end }} - {{- end }} diff --git a/charts/fullstack-deployment/charts/acme-cluster-issuer/values.yaml b/charts/fullstack-deployment/charts/acme-cluster-issuer/values.yaml deleted file mode 100644 index 8495d2b86..000000000 --- a/charts/fullstack-deployment/charts/acme-cluster-issuer/values.yaml +++ /dev/null @@ -1,24 +0,0 @@ -global: - namespaceOverride: "" - ingressClassName: "" - -issuers: - annotations: - staging: - name: letsencrypt-staging - email: "" - production: - name: letsencrypt-prod - email: "" - -solvers: - http01: - enabled: true - solverType: "ingress" # "ingress" or "gatewayHTTPRoute" - ingress: - name: "" - class: "" - serviceType: "NodePort" - gatewayHTTPRoute: - name: "" - namespace: ""