From 7bfc9f94050d77a7028e7f14f7d1172384703bbc Mon Sep 17 00:00:00 2001
From: crozzy <joseph.crosland@gmail.com>
Date: Mon, 11 Oct 2021 12:15:42 -0700
Subject: [PATCH] contrib: update config secret

As we are going down the path of templating the config file
in app-interface the file name is already specified there so
we can lose some clutter by allowing kube to create the file.

Signed-off-by: crozzy <joseph.crosland@gmail.com>
---
 contrib/openshift/manifests/manifests.yaml | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/contrib/openshift/manifests/manifests.yaml b/contrib/openshift/manifests/manifests.yaml
index 75d830893f..e3371617c8 100644
--- a/contrib/openshift/manifests/manifests.yaml
+++ b/contrib/openshift/manifests/manifests.yaml
@@ -42,9 +42,6 @@ objects:
             - name: clair-config
               secret:
                 secretName: config
-                items:
-                  - key: ${{CLAIR_SECRET}}
-                    path: clair.conf
           containers:
             - name: clair-indexer
               resources:
@@ -57,7 +54,7 @@ objects:
               command: [clair]
               env:
                 - name: CLAIR_CONF
-                  value: '/etc/clair/clair.conf'
+                  value: '/etc/clair/config.yaml'
                 - name: CLAIR_MODE
                   value: indexer
               image: ${CLAIR_IMAGE}:${IMAGE_TAG}
@@ -111,9 +108,6 @@ objects:
             - name: clair-config
               secret:
                 secretName: config
-                items:
-                  - key: ${{CLAIR_SECRET}}
-                    path: clair.conf
           containers:
             - name: clair-matcher
               resources:
@@ -126,7 +120,7 @@ objects:
               command: [clair]
               env:
                 - name: CLAIR_CONF
-                  value: '/etc/clair/clair.conf'
+                  value: '/etc/clair/config.yaml'
                 - name: CLAIR_MODE
                   value: matcher
               image: ${CLAIR_IMAGE}:${IMAGE_TAG}
@@ -177,9 +171,6 @@ objects:
             - name: clair-config
               secret:
                 secretName: config
-                items:
-                  - key: ${{CLAIR_SECRET}}
-                    path: clair.conf
           containers:
             - name: clair-notifier
               resources:
@@ -192,7 +183,7 @@ objects:
               command: [clair]
               env:
                 - name: CLAIR_CONF
-                  value: '/etc/clair/clair.conf'
+                  value: '/etc/clair/config.yaml'
                 - name: CLAIR_MODE
                   value: notifier
               image: ${CLAIR_IMAGE}:${IMAGE_TAG}
@@ -352,9 +343,6 @@ parameters:
   #
   # shared params
   #
-  - name: CLAIR_SECRET
-    value: "clair"
-    displayName: the vault secret containing clair's config
   - name: CLAIR_IMAGE
     value: "quay.io/app-sre/clair"
     displayName: the image of clair v4 to deploy