Making the HTTPD_AUTH_OIDC_* environment variables

optional so older httpd auth-configmaps will still work with the newer pods supporting OpenID-Connect.
ManageIQ · Apr 27, 2018 · e380b76 · e380b76
1 parent 223ecbe
commit e380b76
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/templates/miq-template-ext-db.yaml b/templates/miq-template-ext-db.yaml
@@ -554,16 +554,19 @@ objects:
               configMapKeyRef:
                 name: "${HTTPD_SERVICE_NAME}-auth-configs"
                 key: auth-oidc-provider-metadata-url
+                optional: true
           - name: HTTPD_AUTH_OIDC_CLIENT_ID
             valueFrom:
               configMapKeyRef:
                 name: "${HTTPD_SERVICE_NAME}-auth-configs"
                 key: auth-oidc-client-id
+                optional: true
           - name: HTTPD_AUTH_OIDC_CLIENT_SECRET
             valueFrom:
               configMapKeyRef:
                 name: "${HTTPD_SERVICE_NAME}-auth-configs"
                 key: auth-oidc-client-secret
+                optional: true
           lifecycle:
             postStart:
               exec:

diff --git a/templates/miq-template.yaml b/templates/miq-template.yaml
@@ -699,16 +699,19 @@ objects:
               configMapKeyRef:
                 name: "${HTTPD_SERVICE_NAME}-auth-configs"
                 key: auth-oidc-provider-metadata-url
+                optional: true
           - name: HTTPD_AUTH_OIDC_CLIENT_ID
             valueFrom:
               configMapKeyRef:
                 name: "${HTTPD_SERVICE_NAME}-auth-configs"
                 key: auth-oidc-client-id
+                optional: true
           - name: HTTPD_AUTH_OIDC_CLIENT_SECRET
             valueFrom:
               configMapKeyRef:
                 name: "${HTTPD_SERVICE_NAME}-auth-configs"
                 key: auth-oidc-client-secret
+                optional: true
           lifecycle:
             postStart:
               exec: