Merge pull request #280 from openziti/router-ha-enabled

add router config for ha
openziti · Nov 18, 2024 · 090ac17 · 090ac17
2 parents aa99294 + 6fce09e
commit 090ac17
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 9 deletions.
diff --git a/.github/workflows/miniziti.yml b/.github/workflows/miniziti.yml
@@ -3,11 +3,11 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - '.github/workflows/miniziti.yml'
-      - 'charts/ziti-controller/**'
-      - 'charts/ziti-router/**'
-      - 'charts/httpbin/**'
-      - 'charts/zrok/**'
+      - .github/workflows/miniziti.yml
+      - charts/ziti-controller/**
+      - charts/ziti-router/**
+      - charts/httpbin/**
+      - charts/zrok/**
 
 # cancel older, redundant runs of same workflow on same branch
 concurrency:
@@ -36,9 +36,9 @@ jobs:
       - name: install ziti cli
         uses: supplypike/setup-bin@v4
         with:
-          uri: https://github.com/openziti/ziti/releases/download/v1.0.0/ziti-linux-amd64-1.0.0.tar.gz
+          uri: https://github.com/openziti/ziti/releases/download/v1.2.0/ziti-linux-amd64-1.2.0.tar.gz
           name: ziti
-          version: "1.0.0"
+          version: 1.2.0
 
       # this is the kubernetes quickstart script from
       # https://openziti.io/docs/learn/quickstarts/network/local-kubernetes

diff --git a/charts/ziti-router/Chart.yaml b/charts/ziti-router/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: 1.1.15
 description: Host an OpenZiti router in Kubernetes
 name: ziti-router
 type: application
-version: 1.1.2
+version: 1.1.3
diff --git a/charts/ziti-router/README.md b/charts/ziti-router/README.md
@@ -1,7 +1,7 @@
 <!-- README.md generated by helm-docs from README.md.gotmpl -->
 # ziti-router
 
-![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.15](https://img.shields.io/badge/AppVersion-1.1.15-informational?style=flat-square)
+![Version: 1.1.3](https://img.shields.io/badge/Version-1.1.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.1.15](https://img.shields.io/badge/AppVersion-1.1.15-informational?style=flat-square)
 
 Host an OpenZiti router in Kubernetes
 
@@ -277,6 +277,7 @@ identity:
 | forwarder.rateLimitedWorkerCount | int | `64` |  |
 | forwarder.xgressDialQueueLength | int | `1000` |  |
 | forwarder.xgressDialWorkerCount | int | `128` |  |
+| ha.enabled | bool | `false` | must be enabled if multiple controllers |
 | hostNetwork | bool | `false` | Host networking requested for a pod if set, i.e. tproxy ports enabled in the host namespace. i.e. egress gateway |
 | identity.altServerCerts | list | `[]` |  |
 | identityMountDir | string | `"/etc/ziti/identity"` | read-only mountpoint for router identity secret specified in deployment for use by router run container |

diff --git a/charts/ziti-router/templates/configmap.yaml b/charts/ziti-router/templates/configmap.yaml
@@ -42,6 +42,9 @@ data:
       {{- end }}
     {{- end }}
 
+    ha:
+      enabled: {{ .Values.ha.enabled }}
+
     ctrl:
       # router control plane API (:6262)
       endpoint:    tls:{{ required "You must set .Values.ctrl.endpoint to the control plane advertised address. Try adding --set ctrl.endpoint=ziti-controller.example.com:6262 to your Helm command" .Values.ctrl.endpoint }}

diff --git a/charts/ziti-router/values.yaml b/charts/ziti-router/values.yaml
@@ -1,4 +1,8 @@
 
+ha:
+  # -- must be enabled if multiple controllers
+  enabled: false
+
 ctrl:
   # -- required control plane endpoint, e.g., ctrl.ziti.example.com:443
   endpoint: ""