Unverified Commit 85bac1c7 authored by Kevin Di Lallo's avatar Kevin Di Lallo Committed by GitHub
Browse files

Merge pull request #108 from dilallkx/kd_sp27_fixes 

Chart Fixes
parents 052d3cc6 a18889a0

charts/influxdb/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ resources: {} 
podAnnotations: {}



ingress:

  enabled: true

  enabled: false

  tls: false

  # secretName: my-tls-cert # only needed if tls above is true

  hostname: ''

charts/meep-platform-ctrl/values.yaml

+4 −4
Original line number Diff line number Diff line
@@ -46,8 +46,8 @@ ingress: 
    kubernetes.io/ingress.class: nginx

    # kubernetes.io/tls-acme: "true"

    # nginx.ingress.kubernetes.io/rewrite-target: /$2

    # nginx.ingress.kubernetes.io/configuration-snippet: |

    #   rewrite ^(/api)$ $1/ redirect;

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/api$ $scheme://$http_host/api/ permanent;

  labels: {}

  tls:

    # Secrets must be manually created in the namespace.
@@ -69,8 +69,8 @@ altIngress: 
    kubernetes.io/ingress.class: alt-nginx

    # kubernetes.io/tls-acme: "true"

    # nginx.ingress.kubernetes.io/rewrite-target: /$2

    # nginx.ingress.kubernetes.io/configuration-snippet: |

    #   rewrite ^(/api)$ $1/ redirect;

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/api$ $scheme://$http_host/api/ permanent;

  labels: {}

  tls:

    # Secrets must be manually created in the namespace.

charts/meep-sandbox-ctrl/values-template.yaml

+2 −2
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ ingress: 
    # kubernetes.io/tls-acme: "true"

    # nginx.ingress.kubernetes.io/rewrite-target: /$2

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{ .SandboxName }}/api$ /{{ .SandboxName }}/api/ permanent;

      rewrite ^/{{ .SandboxName }}/api$ $scheme://$http_host/{{ .SandboxName }}/api/ permanent;

      rewrite ^/{{ .SandboxName }}/api(/|$)(.*)$ /api/$2 break;

      rewrite ^/{{ .SandboxName }}/sandbox-ctrl(/|$)(.*)$ /sandbox-ctrl/$2 break;

  labels: {}
@@ -74,7 +74,7 @@ altIngress: 
    # kubernetes.io/tls-acme: "true"

    # nginx.ingress.kubernetes.io/rewrite-target: /$2

    nginx.ingress.kubernetes.io/configuration-snippet: |

      rewrite ^/{{ .SandboxName }}/api$ /{{ .SandboxName }}/api/ permanent;

      rewrite ^/{{ .SandboxName }}/api$ $scheme://$http_host/{{ .SandboxName }}/api/ permanent;

      rewrite ^/{{ .SandboxName }}/api(/|$)(.*)$ /api/$2 break;

      rewrite ^/{{ .SandboxName }}/sandbox-ctrl(/|$)(.*)$ /sandbox-ctrl/$2 break;

  labels: {}

go-apps/meepctl/cmd/deploy.go

+0 −16
Original line number Diff line number Diff line
@@ -250,9 +250,7 @@ func deployRunScriptsAndGetFlags(targetName string, chart string, cobraCmd *cobr 
		deployCreateRegistryCerts(chart, cobraCmd)

		flags = utils.HelmFlags(flags, "--set", "persistence.location="+deployData.workdir+"/docker-registry/")

	case "meep-grafana":

		deploySetGrafanaValues(chart, cobraCmd)

		flags = utils.HelmFlags(flags, "--set", "persistentVolume.location="+deployData.workdir+"/grafana/")

		flags = utils.HelmFlags(flags, "--values", deployData.workdir+"/tmp/grafana-values.yaml")

		altServer := utils.RepoCfg.GetBool("repo.deployment.alt-server")

		flags = utils.HelmFlags(flags, "--set", "altIngress.enabled="+strconv.FormatBool(altServer))

	case "meep-influxdb":
@@ -361,20 +359,6 @@ func deployCreateIngressCerts(chart string, cobraCmd *cobra.Command) { 
	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

}



func deploySetGrafanaValues(chart string, cobraCmd *cobra.Command) {

	nodeIp := viper.GetString("node.ip")

	valuesGrafana := chart + "/values.yaml"

	tmpdir := deployData.workdir + "/tmp"



	cmd := exec.Command("mkdir", "-p", tmpdir)

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

	cmd = exec.Command("cp", valuesGrafana, tmpdir+"/grafana-values.yaml")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

	str := "s/<CLUSTERIP>/" + nodeIp + "/g"

	cmd = exec.Command("sed", "-i", str, tmpdir+"/grafana-values.yaml")

	_, _ = utils.ExecuteCmd(cmd, cobraCmd)

}



func deploySetOmtConfig(chart string, cobraCmd *cobra.Command) {

	configOmt := chart + "/config.json"

	cmd := exec.Command("cp", configOmt, deployData.workdir+"/omt/config.json")

js-apps/meep-swagger-ui/index.html

+2 −1
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ 
        plugins: [

          SwaggerUIBundle.plugins.DownloadUrl

        ],

        layout: "StandaloneLayout"

        layout: "StandaloneLayout",

        validatorUrl: null

      })

      // End Swagger UI call region