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

added prod/stagin server support for lets-encrypt deployment

parent d5ea423c
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ repo:
      https-port: 443
      # certificate authority (none|self-signed|lets-encrypt) default: none
      ca: self-signed
      # lets-encrypt production server (true) or staging server (false)
      le-server-prod: false

  #------------------------------
  #  Core Subsystem
+5 −1
Original line number Diff line number Diff line
@@ -5,7 +5,11 @@ metadata:
  name: {{ .Values.letsEncrypt.issuer }}
spec:
  acme:
    server: {{ .Values.letsEncrypt.acme.server }}
    {{- if .Values.letsEncrypt.acme.prod }}
    server: {{ .Values.letsEncrypt.acme.prodServer }}
    {{- else }}
    server: {{ .Values.letsEncrypt.acme.stagingServer }}
    {{- end }}
    email: AdvantEDGE@InterDigital.com
    privateKeySecretRef:
      name: letsencrypt
+3 −1
Original line number Diff line number Diff line
@@ -7,7 +7,9 @@ letsEncrypt:

  issuer: letsencrypt
  acme:
    server: https://acme-staging-v02.api.letsencrypt.org/directory
    prod: true
    prodServer: https://acme-v02.api.letsencrypt.org/directory
    stagingServer: https://acme-staging-v02.api.letsencrypt.org/directory

  defaultBackend:
    service:
+4 −2
Original line number Diff line number Diff line
@@ -262,12 +262,14 @@ func deployRunScriptsAndGetFlags(targetName string, chart string, cobraCmd *cobr
		}
	case "meep-ingress-certs":
		// Deploy Lets-Encrypt or self-signed Certificates
		ca := utils.RepoCfg.GetString("repo.deployment.ingress.https.ca")
		ca := utils.RepoCfg.GetString("repo.deployment.ingress.ca")
		switch ca {
		case "lets-encrypt":
			host := utils.RepoCfg.GetString("repo.deployment.ingress.host")
			flags = utils.HelmFlags(flags, "--set", "letsEncrypt.tls.host="+host)
			prod := utils.RepoCfg.GetBool("repo.deployment.ingress.le-server-prod")
			flags = utils.HelmFlags(flags, "--set", "letsEncrypt.enabled=true")
			flags = utils.HelmFlags(flags, "--set", "letsEncrypt.tls.host="+host)
			flags = utils.HelmFlags(flags, "--set", "letsEncrypt.acme.prod="+strconv.FormatBool(prod))
		case "self-signed":
			deployCreateIngressCerts(chart, cobraCmd)
		default: