Commit 30bbcbae authored by Kevin Di Lallo's avatar Kevin Di Lallo
Browse files

moved session encryption key & oauth keys from deployment config file to k8s secrets

parent b55de4a3

.meepctl-repocfg.yaml

+10 −17
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ repo: 
    # platform ingress configuration

    ingress:

      # host name

      host: my-advantedge.com

      host: my-platform-fqdn

      # enable https only (redirect http requests to https port)

      https-only: true

      # bind to host ports (true) or node ports (false)
@@ -45,23 +45,16 @@ repo: 
      # lets-encrypt production server (true) or staging server (false)

      le-server-prod: false



    # authentication & authorization config

    auth:

      # session encryption key

      session-key: my-secret-key

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

      session-key-secret: meep-session

      # Github OAuth k8s secret (data: client-id, secret)

      github-secret: meep-oauth-github

      # Github OAuth k8s secret (data: client-id, secret)

      gitlab-secret: meep-oauth-gitlab

      # OAuth redirect URI

      redirect-uri: https://my-platform-fqdn/platform-ctrl/v1/authorize

      # Github OAuth configuration

      github:

        # Client app identifier

        client-id: my-client-id

        # Oatuh app secret

        secret: my-secret

      # Gitlab OAuth configuration

      gitlab:

        # Client app identifier

        client-id: my-client-id

        # Oatuh app secret

        secret: my-secret

      



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

charts/meep-mon-engine/templates/deployment.yaml

+8 −0
Original line number Diff line number Diff line
@@ -44,6 +44,14 @@ spec: 
            - name: {{ $key }}

              value: {{ $value }}

            {{- end }}

            {{- range $key, $value := .Values.image.envSecret }}

            - name: {{ $key }}

              valueFrom:

                secretKeyRef:

                  name: {{ $value.name }}

                  key: {{ $value.key }}

                  optional: true

            {{- end }}

          {{- if .Values.codecov.enabled}}

          volumeMounts:

          - name: codecov-storage

charts/meep-mon-engine/values.yaml

+4 −2
Original line number Diff line number Diff line
@@ -27,8 +27,10 @@ image: 
    MEEP_DEPENDENCY_PODS: ""

    MEEP_CORE_PODS: ""

    MEEP_SANDBOX_PODS: ""

    MEEP_SESSION_KEY: "my-secret-key"



  envSecret:

    MEEP_SESSION_KEY:

      name: meep-session

      key: encryption-key

service:

  type: ClusterIP

  port: 80

charts/meep-platform-ctrl/templates/deployment.yaml

+8 −0
Original line number Diff line number Diff line
@@ -54,6 +54,14 @@ spec: 
            - name: {{ $key }}

              value: {{ $value | quote }}

            {{- end }}

            {{- range $key, $value := .Values.image.envSecret }}

            - name: {{ $key }}

              valueFrom:

                secretKeyRef:

                  name: {{ $value.name }}

                  key: {{ $value.key }}

                  optional: true

            {{- end }}

            {{- if .Values.user.frontend.enabled}}

            - name: USER_FRONTEND

              value: {{ .Values.user.frontend.mountpath }}

charts/meep-platform-ctrl/values.yaml

+17 −8
Original line number Diff line number Diff line
@@ -24,15 +24,24 @@ image: 
  tag: latest

  pullPolicy: Always

  env:

    MEEP_SESSION_KEY: "my-secret-key"

    MEEP_MAX_SESSIONS: "10"

    MEEP_PLATFORM_URI: "https://<my-platform-fqdn>"

    MEEP_OAUTH_GITHUB_CLIENT_ID: "my-github-client-id"

    MEEP_OAUTH_GITHUB_REDIRECT_URI: "https://<my-platform-fqdn>/platform-ctrl/v1/authorize"

    MEEP_OAUTH_GITHUB_SECRET: "my-github-secret"

    MEEP_OAUTH_GITLAB_CLIENT_ID: "my-gitlab-client-id"

    MEEP_OAUTH_GITLAB_REDIRECT_URI: "https://<my-platform-fqdn>/platform-ctrl/v1/authorize"

    MEEP_OAUTH_GITLAB_SECRET: "my-gitlab-secret"

    MEEP_OAUTH_REDIRECT_URI: "https://<my-platform-fqdn>/platform-ctrl/v1/authorize"

  envSecret:

    MEEP_SESSION_KEY:

      name: meep-session

      key: encryption-key

    MEEP_OAUTH_GITHUB_CLIENT_ID:

      name: github-secret

      key: client-id

    MEEP_OAUTH_GITHUB_SECRET:

      name: github-secret

      key: secret

    MEEP_OAUTH_GITLAB_CLIENT_ID:

      name: gitlab-secret

      key: client-id

    MEEP_OAUTH_GITLAB_SECRET:

      name: gitlab-secret

      key: secret



service:

  type: ClusterIP