add quickstart support for ha

openziti · Nov 14, 2024 · e48c687 · e48c687
1 parent e7c3be1
commit e48c687
Show file tree

Hide file tree

Showing 15 changed files with 1,135 additions and 160 deletions.
diff --git a/ziti/cmd/create/config_templates/controller.yml b/ziti/cmd/create/config_templates/controller.yml
@@ -10,7 +10,7 @@ v: 3
 
 {{ if .Controller.Ctrl.MinClusterSize }}
 raft:
-  dataDir:         "{{ .ZitiHome }}/raft"
+  dataDir:         "{{ .ZitiHome }}/raft{{ .InstanceId }}"
   minClusterSize:  {{ .Controller.Ctrl.MinClusterSize }}
 {{ else }}
 db:                     "{{ .Controller.Database.DatabaseFile }}"
@@ -233,6 +233,8 @@ web:
         options: { }
       - binding: fabric
         options: { }
+      - binding: edge-oidc
+        options: { }
       {{ if not .Controller.Web.BindPoints.Console.Enabled }}#{{- end }}- binding: zac
       {{ if not .Controller.Web.BindPoints.Console.Enabled }}#{{- end }}  options:
       {{ if not .Controller.Web.BindPoints.Console.Enabled }}#{{- end }}    location: {{ .Controller.Web.BindPoints.Console.Location }}

diff --git a/ziti/cmd/create/config_templates/router.yml b/ziti/cmd/create/config_templates/router.yml
@@ -16,6 +16,9 @@ identity:
   {{ if not .Router.AltCertsEnabled }}#{{ end }}  - server_cert:  "{{ .Router.AltServerCert }}"
   {{ if not .Router.AltCertsEnabled }}#{{ end }}    server_key:   "{{ .Router.AltServerKey }}"
 
+ha:
+  enabled: {{ .Router.IsHA }}
+
 ctrl:
   endpoint:             tls:{{ .Controller.Ctrl.AdvertisedAddress }}:{{ .Controller.Ctrl.AdvertisedPort }}
 

diff --git a/ziti/cmd/create/create_config.go b/ziti/cmd/create/create_config.go
@@ -112,8 +112,8 @@ type BindPointsValues struct {
 }
 
 type ConsoleValues struct {
-	Enabled       bool
-	Location      string
+	Enabled  bool
+	Location string
 }
 
 type IdentityValues struct {
@@ -165,6 +165,7 @@ type RouterTemplateValues struct {
 	Wss                WSSRouterTemplateValues
 	Forwarder          RouterForwarderTemplateValues
 	Listener           RouterListenerTemplateValues
+	IsHA               bool
 }
 
 type EdgeRouterTemplateValues struct {

diff --git a/ziti/cmd/create/create_config_router.go b/ziti/cmd/create/create_config_router.go
@@ -38,6 +38,7 @@ type CreateConfigRouterOptions struct {
 	IsPrivate    bool
 	TunnelerMode string
 	LanInterface string
+	IsHA         bool
 }
 
 type NewCreateConfigRouterCmd struct {

diff --git a/ziti/cmd/create/create_config_router_edge.go b/ziti/cmd/create/create_config_router_edge.go
@@ -78,6 +78,7 @@ func NewCmdCreateConfigRouterEdge(routerOptions *CreateConfigRouterOptions, data
 			data.Router.Edge.LanInterface = routerOptions.LanInterface
 			data.Router.Edge.Resolver = cmdhelper.GetZitiEdgeRouterResolver()
 			data.Router.Edge.DnsSvcIpRange = cmdhelper.GetZitiEdgeRouterDnsSvcIpRange()
+			data.Router.IsHA = routerOptions.IsHA
 		},
 		Run: func(cmd *cobra.Command, args []string) {
 			routerOptions.Cmd = cmd