feat: update examples for ES 10.3.0 (#8)

Add requestIbmServices to CRs Update SCC Signed-off-by: Dave <davilane@uk.ibm.com>
ibm-messaging · Mar 26, 2021 · bc7ad07 · bc7ad07
1 parent a33c70b
commit bc7ad07
Show file tree

Hide file tree

Showing 14 changed files with 39 additions and 24 deletions.
diff --git a/cr-examples/eventstreams-georeplicator/07-georeplicator.yaml b/cr-examples/eventstreams-georeplicator/07-georeplicator.yaml
@@ -19,5 +19,5 @@ metadata:
     # The value of this label needs to match the metadata.name of your EventStreams cluster
     eventstreams.ibm.com/cluster: minimal-prod
 spec:
-  version: 10.2.0-eus
+  version: 10.3.0
   replicas: 1
diff --git a/cr-examples/eventstreams/01-light-insecure.yaml b/cr-examples/eventstreams/01-light-insecure.yaml
@@ -15,7 +15,7 @@ kind: EventStreams
 metadata:
   name: light-insecure
 spec:
-  version: 10.2.0-eus
+  version: 10.3.0
   license:
     # By installing this product you accept the license terms at https://ibm.biz/es-license
     accept: false
@@ -47,3 +47,6 @@ spec:
       metrics: {}
       storage:
         type: ephemeral
+  requestIbmServices:
+    iam: false
+    monitoring: false
diff --git a/cr-examples/eventstreams/02-development.yaml b/cr-examples/eventstreams/02-development.yaml
@@ -15,7 +15,7 @@ kind: EventStreams
 metadata:
   name: development
 spec:
-  version: 10.2.0-eus
+  version: 10.3.0
   license:
     # By installing this product you accept the license terms at https://ibm.biz/es-license
     accept: false
@@ -55,3 +55,6 @@ spec:
       metrics: {}
       storage:
         type: ephemeral
+  requestIbmServices:
+    iam: true
+    monitoring: true
diff --git a/cr-examples/eventstreams/03-minimal-prod.yaml b/cr-examples/eventstreams/03-minimal-prod.yaml
@@ -15,7 +15,7 @@ kind: EventStreams
 metadata:
   name: minimal-prod
 spec:
-  version: 10.2.0-eus
+  version: 10.3.0
   license:
     # By installing this product you accept the license terms at https://ibm.biz/es-license
     accept: false
@@ -59,3 +59,6 @@ spec:
         type: persistent-claim
         size: 2Gi
         class: enter-storage-class-name-here
+  requestIbmServices:
+    iam: true
+    monitoring: true
diff --git a/cr-examples/eventstreams/04-prod-3-brokers.yaml b/cr-examples/eventstreams/04-prod-3-brokers.yaml
@@ -15,7 +15,7 @@ kind: EventStreams
 metadata:
   name: prod-3-brokers
 spec:
-  version: 10.2.0-eus
+  version: 10.3.0
   license:
     # By installing this product you accept the license terms at https://ibm.biz/es-license
     accept: false
@@ -66,3 +66,6 @@ spec:
         type: persistent-claim
         size: 4Gi
         class: enter-storage-class-name-here
+  requestIbmServices:
+    iam: true
+    monitoring: true
diff --git a/cr-examples/eventstreams/05-prod-6-brokers.yaml b/cr-examples/eventstreams/05-prod-6-brokers.yaml
@@ -15,7 +15,7 @@ kind: EventStreams
 metadata:
   name: prod-6-brokers
 spec:
-  version: 10.2.0-eus
+  version: 10.3.0
   license:
     # By installing this product you accept the license terms at https://ibm.biz/es-license
     accept: false
@@ -65,3 +65,6 @@ spec:
         type: persistent-claim
         size: 4Gi
         class: enter-storage-class-name-here
+  requestIbmServices:
+    iam: true
+    monitoring: true
diff --git a/cr-examples/eventstreams/06-prod-9-brokers.yaml b/cr-examples/eventstreams/06-prod-9-brokers.yaml
@@ -15,7 +15,7 @@ kind: EventStreams
 metadata:
   name: prod-9-brokers
 spec:
-  version: 10.2.0-eus
+  version: 10.3.0
   license:
     # By installing this product you accept the license terms at https://ibm.biz/es-license
     accept: false
@@ -65,3 +65,6 @@ spec:
         size: 10Gi
         class: enter-storage-class-name-here
       metrics: {}
+  requestIbmServices:
+    iam: true
+    monitoring: true
diff --git a/cr-examples/kafka-connect/kafka-connect-non-production.yaml b/cr-examples/kafka-connect/kafka-connect-non-production.yaml
@@ -27,12 +27,12 @@ spec:
           eventstreams.production.type: CloudPakForIntegrationNonProduction
           productID: 2a79e49111f44ec3acd89608e56138f5
           productName: IBM Event Streams for Non Production
-          productVersion: 10.2.0
+          productVersion: 10.3.0
           productMetric: VIRTUAL_PROCESSOR_CORE
           productChargedContainers: <ADD-NAME-OF-KAFKA-CONNECT-CR>-connect
           cloudpakId: c8b82d189e7545f0892db9ef2731b90d
           cloudpakName: IBM Cloud Pak for Integration
-          cloudpakVersion: 2020.4.1
+          cloudpakVersion: 2021.1.1
           productCloudpakRatio: "2:1"
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:

diff --git a/cr-examples/kafka-connect/kafka-connect-production.yaml b/cr-examples/kafka-connect/kafka-connect-production.yaml
@@ -27,12 +27,12 @@ spec:
           eventstreams.production.type: CloudPakForIntegrationProduction
           productID: 2cba508800504d0abfa48a0e2c4ecbe2
           productName: IBM Event Streams
-          productVersion: 10.2.0
+          productVersion: 10.3.0
           productMetric: VIRTUAL_PROCESSOR_CORE
           productChargedContainers: <ADD-NAME-OF-KAFKA-CONNECT-CR>-connect
           cloudpakId: c8b82d189e7545f0892db9ef2731b90d
           cloudpakName: IBM Cloud Pak for Integration
-          cloudpakVersion: 2020.4.1
+          cloudpakVersion: 2021.1.1
           productCloudpakRatio: "1:1"
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:

diff --git a/cr-examples/kafka-connect/kafka-connect-s2i-non-production.yaml b/cr-examples/kafka-connect/kafka-connect-s2i-non-production.yaml
@@ -27,12 +27,12 @@ spec:
           eventstreams.production.type: CloudPakForIntegrationNonProduction
           productID: 2a79e49111f44ec3acd89608e56138f5
           productName: IBM Event Streams for Non Production
-          productVersion: 10.2.0
+          productVersion: 10.3.0
           productMetric: VIRTUAL_PROCESSOR_CORE
           productChargedContainers: <ADD-NAME-OF-KAFKA-CONNECT-CR>-connect
           cloudpakId: c8b82d189e7545f0892db9ef2731b90d
           cloudpakName: IBM Cloud Pak for Integration
-          cloudpakVersion: 2020.4.1
+          cloudpakVersion: 2021.1.1
           productCloudpakRatio: "2:1"
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:

diff --git a/cr-examples/kafka-connect/kafka-connect-s2i-production.yaml b/cr-examples/kafka-connect/kafka-connect-s2i-production.yaml
@@ -27,12 +27,12 @@ spec:
           eventstreams.production.type: CloudPakForIntegrationProduction
           productID: 2cba508800504d0abfa48a0e2c4ecbe2
           productName: IBM Event Streams
-          productVersion: 10.2.0
+          productVersion: 10.3.0
           productMetric: VIRTUAL_PROCESSOR_CORE
           productChargedContainers: <ADD-NAME-OF-KAFKA-CONNECT-CR>-connect
           cloudpakId: c8b82d189e7545f0892db9ef2731b90d
           cloudpakName: IBM Cloud Pak for Integration
-          cloudpakVersion: 2020.4.1
+          cloudpakVersion: 2021.1.1
           productCloudpakRatio: "1:1"
   bootstrapServers: my-cluster-kafka-bootstrap:9093
   tls:

diff --git a/cr-examples/kafka-mirror-maker-2/kafka-mirror-maker-2-non-production.yaml b/cr-examples/kafka-mirror-maker-2/kafka-mirror-maker-2-non-production.yaml
@@ -22,12 +22,12 @@ spec:
           eventstreams.production.type: CloudPakForIntegrationNonProduction
           productID: 2a79e49111f44ec3acd89608e56138f5
           productName: IBM Event Streams for Non Production
-          productVersion: 10.2.0
+          productVersion: 10.3.0
           productMetric: VIRTUAL_PROCESSOR_CORE
           productChargedContainers: <ADD-NAME-OF-MM2-CR>-mirrormaker2
           cloudpakId: c8b82d189e7545f0892db9ef2731b90d
           cloudpakName: IBM Cloud Pak for Integration
-          cloudpakVersion: 2020.4.1
+          cloudpakVersion: 2021.1.1
           productCloudpakRatio: "2:1"
   connectCluster: "my-cluster-target"
   clusters:

diff --git a/cr-examples/kafka-mirror-maker-2/kafka-mirror-maker-2-production.yaml b/cr-examples/kafka-mirror-maker-2/kafka-mirror-maker-2-production.yaml
@@ -22,12 +22,12 @@ spec:
           eventstreams.production.type: CloudPakForIntegrationProduction
           productID: 2cba508800504d0abfa48a0e2c4ecbe2
           productName: IBM Event Streams
-          productVersion: 10.2.0
+          productVersion: 10.3.0
           productMetric: VIRTUAL_PROCESSOR_CORE
           productChargedContainers: <ADD-NAME-OF-MM2-CR>-mirrormaker2
           cloudpakId: c8b82d189e7545f0892db9ef2731b90d
           cloudpakName: IBM Cloud Pak for Integration
-          cloudpakVersion: 2020.4.1
+          cloudpakVersion: 2021.1.1
           productCloudpakRatio: "1:1"
   connectCluster: "my-cluster-target"
   clusters:

diff --git a/eventstreams-scc.yaml b/eventstreams-scc.yaml
@@ -25,7 +25,7 @@ fsGroup:
 kind: SecurityContextConstraints
 metadata:
   name: ibm-es-scc
-priority: 2
+priority: 0
 readOnlyRootFilesystem: false
 requiredDropCapabilities:
   - MKNOD
@@ -37,10 +37,7 @@ seLinuxContext:
   type: MustRunAs
 supplementalGroups:
   type: RunAsAny
-groups:
-  # If not running in the myproject namespace change this to the namespace of your installation or add an additional
-  # entry to the array
-  - system:serviceaccounts:myproject
+groups: []
 volumes:
   - configMap
   - downwardAPI