Commit d5ea423c authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

ingress deployment config updates

parent 341e6b58

.meepctl-repocfg.yaml

+5 −11
Original line number Diff line number Diff line
@@ -34,17 +34,11 @@ repo: 
      host: my-advantedge.com

      # bind to host ports (true) or node ports (false)

      host-ports: true

      # http config

      http:

      # http port number

        port: 80

      http-port: 80

      # https config

      https:

        # enable https

        enabled: true

        # https port number

        port: 443

        # certificate authority (self-signed|lets-encrypt) default: self-signed

      https-port: 443

      # certificate authority (none|self-signed|lets-encrypt) default: none

      ca: self-signed



  #------------------------------

go-apps/meepctl/cmd/deploy.go

+12 −16
Original line number Diff line number Diff line
@@ -243,8 +243,8 @@ func deployRunScriptsAndGetFlags(targetName string, chart string, cobraCmd *cobr 
	case "meep-ingress":

		// Port configuration

		hostPorts := utils.RepoCfg.GetBool("repo.deployment.ingress.host-ports")

		httpPort := utils.RepoCfg.GetString("repo.deployment.ingress.http.port")

		httpsPort := utils.RepoCfg.GetString("repo.deployment.ingress.https.port")

		httpPort := utils.RepoCfg.GetString("repo.deployment.ingress.http-port")

		httpsPort := utils.RepoCfg.GetString("repo.deployment.ingress.https-port")

		if hostPorts {

			flags = utils.HelmFlags(flags, "--set", "controller.service.ports.http="+httpPort)

			flags = utils.HelmFlags(flags, "--set", "controller.daemonset.hostPorts.http="+httpPort)
@@ -260,22 +260,18 @@ func deployRunScriptsAndGetFlags(targetName string, chart string, cobraCmd *cobr 
			flags = utils.HelmFlags(flags, "--set", "controller.service.nodePorts.http="+httpPort)

			flags = utils.HelmFlags(flags, "--set", "controller.service.nodePorts.https="+httpsPort)

		}

		// HTTPS configuration

		httpsEnabled := utils.RepoCfg.GetBool("repo.deployment.ingress.https.enabled")

		flags = utils.HelmFlags(flags, "--set", "controller.service.enableHttps="+strconv.FormatBool(httpsEnabled))

	case "meep-ingress-certs":

		// Deploy Lets-Encrypt or self-signed Certificates

		httpsEnabled := utils.RepoCfg.GetBool("repo.deployment.ingress.https.enabled")

		if httpsEnabled {

		ca := utils.RepoCfg.GetString("repo.deployment.ingress.https.ca")

		switch ca {

		case "lets-encrypt":

			host := utils.RepoCfg.GetString("repo.deployment.ingress.host")

			flags = utils.HelmFlags(flags, "--set", "letsEncrypt.tls.host="+host)

			flags = utils.HelmFlags(flags, "--set", "letsEncrypt.enabled=true")

			default: // self-signed

		case "self-signed":

			deployCreateIngressCerts(chart, cobraCmd)

			}

		default:

			// none

		}

	case "meep-mon-engine":

		monEngineTarget := "repo.core.go-apps.meep-mon-engine"