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

new deployment configuration to enable/disable authentication & authorization

parent bad18cd8

.meepctl-repocfg.yaml

+8 −5
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



version: 1.6.0

version: 1.6.2

repo:

  name: AdvantEDGE
@@ -47,6 +47,9 @@ repo: 


    # authentication & authorization config

    auth:

      # enable authentication & authorization

      enabled: false

      # Session config

      session:

        # session encryption key k8s secret (data: encryption-key)

        key-secret: meep-session
@@ -96,15 +99,15 @@ repo: 
        # user supplied value file located @ .meep/user/values (use below file name)

        chart-user-values: meep-auth-svc.yaml

        # enable meepctl build

        build: true

        build: false

        # enable meepctl dockerize

        dockerize: true

        dockerize: false

        # enable meepctl deploy/delete

        deploy: true

        deploy: false

        # supports code coverage measurement when built in codecov mode

        codecov: true

        # supports linting

        lint: true

        lint: false

        # location of API specification

        api: go-apps/meep-auth-svc/api/swagger.yaml

        # AdvantEDGE resources included in Docker container image

charts/grafana/values.yaml

+1 −1
Original line number Diff line number Diff line
@@ -123,8 +123,8 @@ ingress: 
  enabled: true

  annotations:

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

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=grafana

    kubernetes.io/ingress.class: nginx

    # nginx.ingress.kubernetes.io/auth-url: <-- set by 'meepctl deploy' when auth enabled

  labels: {}

  path: /grafana(/|$)(.*)

  hosts:

charts/meep-gis-engine/values-template.yaml

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ image: 
  pullPolicy: Always

  env:

    MEEP_SANDBOX_NAME: {{ .SandboxName }}

    MEEP_SESSION_KEY: {{ .SessionKey }}



service:

  name: meep-gis-engine
@@ -32,9 +31,11 @@ ingress: 
  annotations:

    kubernetes.io/ingress.class: nginx

    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-gis-engine&sbox={{ .SandboxName }}

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

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

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-gis-engine&sbox={{ .SandboxName }}

    {{- end }}

  labels: {}

  tls:

charts/meep-loc-serv/values-template.yaml

+3 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ image: 
  env:

    MEEP_SANDBOX_NAME: {{ .SandboxName }}

    MEEP_HOST_URL: {{ .HostUrl }}

    MEEP_SESSION_KEY: {{ .SessionKey }}



service:

  name: meep-loc-serv
@@ -33,9 +32,11 @@ ingress: 
  annotations:

    kubernetes.io/ingress.class: nginx

    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-loc-serv&sbox={{ .SandboxName }}

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

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

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-loc-serv&sbox={{ .SandboxName }}

    {{- end }}

  labels: {}

  tls:

charts/meep-metrics-engine/values-template.yaml

+3 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ image: 
  env:

    MEEP_SANDBOX_NAME: {{ .SandboxName }}

    MEEP_HOST_URL: {{ .HostUrl }}

    MEEP_SESSION_KEY: {{ .SessionKey }}



service:

  name: meep-metrics-engine
@@ -33,9 +32,11 @@ ingress: 
  annotations:

    kubernetes.io/ingress.class: nginx

    nginx.ingress.kubernetes.io/force-ssl-redirect: {{ .HttpsOnly }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-metrics-engine&sbox={{ .SandboxName }}

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

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

    {{- if .AuthEnabled }}

    nginx.ingress.kubernetes.io/auth-url: https://$http_host/auth/v1/authenticate?svc=meep-metrics-engine&sbox={{ .SandboxName }}

    {{- end }}

  labels: {}

  tls: