fix: Comply to stable API for SBO

IBM · Nov 3, 2021 · 0186941 · 0186941
1 parent 21555c6
commit 0186941
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/config/cloudpaks/cp4i/client/base/kustomization.yaml b/config/cloudpaks/cp4i/client/base/kustomization.yaml
@@ -6,4 +6,5 @@ resources:
   - mq-dev-patterns-node-deployment.yaml
   - openjdk-imagestream.yaml
   - node-imagestream.yaml
+  - sbo-account-role-binding.yaml
   - service-binding.yaml
diff --git a/config/cloudpaks/cp4i/client/base/mq-dev-patterns-jms-deployment.yaml b/config/cloudpaks/cp4i/client/base/mq-dev-patterns-jms-deployment.yaml
@@ -25,7 +25,10 @@ spec:
         app.kubernetes.io/part-of: app-mq-dev-patterns
     spec:
       containers:
-        - image: image-registry.openshift-image-registry.svc:5000/dev/mq-dev-patterns-jms:latest
+        - env:
+            - name: SERVICE_BINDING_ROOT
+              value: /config
+          image: image-registry.openshift-image-registry.svc:5000/dev/mq-dev-patterns-jms:latest
           imagePullPolicy: Always
           name: mq-dev-patterns-jms
           ports:

diff --git a/config/cloudpaks/cp4i/client/base/mq-dev-patterns-node-deployment.yaml b/config/cloudpaks/cp4i/client/base/mq-dev-patterns-node-deployment.yaml
@@ -25,7 +25,10 @@ spec:
         app.kubernetes.io/part-of: app-mq-dev-patterns
     spec:
       containers:
-        - image: image-registry.openshift-image-registry.svc:5000/dev/mq-dev-patterns-node:latest
+        - env:
+            - name: SERVICE_BINDING_ROOT
+              value: /config
+          image: image-registry.openshift-image-registry.svc:5000/dev/mq-dev-patterns-node:latest
           imagePullPolicy: Always
           name: mq-dev-patterns-node
           ports:

diff --git a/config/cloudpaks/cp4i/client/base/sbo-account-role-binding.yaml b/config/cloudpaks/cp4i/client/base/sbo-account-role-binding.yaml
@@ -0,0 +1,18 @@
+---
+# https://github.ibm.com/IBMPrivateCloud/roadmap/issues/48099
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  creationTimestamp: null
+  name: sbo-admin-cloudpaks
+  namespace: ibm-cloudpaks
+  annotations:
+    argocd.argoproj.io/sync-wave: "10"
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: admin
+subjects:
+  - kind: ServiceAccount
+    name: service-binding-operator
+    namespace: openshift-operators
diff --git a/config/cloudpaks/cp4i/client/base/service-binding.yaml b/config/cloudpaks/cp4i/client/base/service-binding.yaml
@@ -16,7 +16,6 @@ spec:
     version: v1
     resource: deployments
   bindAsFiles: true
-  mountPath: /config
   services:
     - group: mq.ibm.com
       version: v1beta1