diff --git a/.github/workflows/miniziti.yml b/.github/workflows/miniziti.yml index a0907abf6..ac4498e01 100644 --- a/.github/workflows/miniziti.yml +++ b/.github/workflows/miniziti.yml @@ -52,8 +52,7 @@ jobs: - name: install miniziti uses: supplypike/setup-bin@v4 with: - # uri: https://get.openziti.io/miniziti.bash - uri: https://raw.githubusercontent.com/openziti/ziti/refs/heads/quick-k8s-helm-deps/quickstart/kubernetes/miniziti.bash + uri: https://get.openziti.io/miniziti.bash name: miniziti version: quickstartrelease diff --git a/charts/ziti-controller/Chart.yaml b/charts/ziti-controller/Chart.yaml index e2fa7f861..f34b53c68 100644 --- a/charts/ziti-controller/Chart.yaml +++ b/charts/ziti-controller/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 1.4.2 +appVersion: 1.5.3 dependencies: - condition: cert-manager.enabled name: cert-manager @@ -16,4 +16,4 @@ dependencies: description: Host an OpenZiti controller in Kubernetes name: ziti-controller type: application -version: 1.2.2 +version: 1.3.0 diff --git a/charts/ziti-controller/README.md b/charts/ziti-controller/README.md index ee9ed6b80..bb7369198 100644 --- a/charts/ziti-controller/README.md +++ b/charts/ziti-controller/README.md @@ -2,7 +2,7 @@ # ziti-controller -![Version: 1.2.2](https://img.shields.io/badge/Version-1.2.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.4.2](https://img.shields.io/badge/AppVersion-1.4.2-informational?style=flat-square) +![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.5.3](https://img.shields.io/badge/AppVersion-1.5.3-informational?style=flat-square) Host an OpenZiti controller in Kubernetes diff --git a/charts/ziti-controller/templates/ca-selfsigned-issuer.yaml b/charts/ziti-controller/templates/ca-selfsigned-issuer.yaml index 593000ded..c04d0e15f 100644 --- a/charts/ziti-controller/templates/ca-selfsigned-issuer.yaml +++ b/charts/ziti-controller/templates/ca-selfsigned-issuer.yaml @@ -1,8 +1,6 @@ -# generate a self-signed issuer if no alternative issuer is configured for the controller's -# control plane and web binding PKIs -{{- if and (eq (len .Values.ctrlPlane.alternativeIssuer) 0) (eq (len .Values.webBindingPki.alternativeIssuer) 0) }} +# generate an empty Issuer for creating root CAs unless all the controller's other PKIs are configured with an alternative issuer +{{- if or (eq (len .Values.ctrlPlane.alternativeIssuer) 0) (eq (len .Values.webBindingPki.alternativeIssuer) 0) (eq (len .Values.edgeSignerPki.alternativeIssuer) 0) }} --- -# an 'empty' Issuer for creating self-signed root-CA's apiVersion: cert-manager.io/v1 kind: Issuer metadata: