Merge pull request #34 from osodevops/multi-cluster-single-mds

sionsmith · web-flow · commit 1da6c66c3baa · 2022-07-13T21:06:06.000+01:00
moved components to 7.2.0 Confluent Platform.
diff --git a/base/cfk-components/confluent-no-auth-no-tls/connect/kafka-connect.yaml b/base/cfk-components/confluent-no-auth-no-tls/connect/kafka-connect.yaml
@@ -6,5 +6,5 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-server-connect:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-server-connect:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
diff --git a/base/cfk-components/confluent-no-auth-no-tls/control-centre.yaml b/base/cfk-components/confluent-no-auth-no-tls/control-centre.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-enterprise-control-center:7.1.0
+    application: confluentinc/cp-enterprise-control-center:7.2.0
     init: confluentinc/confluent-init-container:2.2.0-1
   dataVolumeCapacity: 10Gi
   dependencies:
diff --git a/base/cfk-components/confluent-no-auth-no-tls/kafka.yaml b/base/cfk-components/confluent-no-auth-no-tls/kafka.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 3
   image:
-    application: confluentinc/cp-server:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-server:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   metricReporter:
     enabled: true
diff --git a/base/cfk-components/confluent-no-auth-no-tls/ksqldb/ksqldb.yaml b/base/cfk-components/confluent-no-auth-no-tls/ksqldb/ksqldb.yaml
@@ -6,6 +6,6 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-ksqldb-server:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-ksqldb-server:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
diff --git a/base/cfk-components/confluent-no-auth-no-tls/schema-registry/schema-registry.yaml b/base/cfk-components/confluent-no-auth-no-tls/schema-registry/schema-registry.yaml
@@ -5,5 +5,5 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-schema-registry:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-schema-registry:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
diff --git a/base/cfk-components/confluent-no-auth-no-tls/zookeeper.yaml b/base/cfk-components/confluent-no-auth-no-tls/zookeeper.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   replicas: 3
   image:
-    application: confluentinc/cp-zookeeper:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-zookeeper:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   logVolumeCapacity: 10Gi
diff --git a/base/cfk-components/confluent-no-auth-tls/connect/kafka-connect.yaml b/base/cfk-components/confluent-no-auth-tls/connect/kafka-connect.yaml
@@ -6,8 +6,8 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-server-connect:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-server-connect:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   tls:
     autoGeneratedCerts: true
   dependencies:
diff --git a/base/cfk-components/confluent-no-auth-tls/control-centre.yaml b/base/cfk-components/confluent-no-auth-tls/control-centre.yaml
@@ -12,8 +12,8 @@ spec:
         failureThreshold: 5
         timeoutSeconds: 500
   image:
-    application: confluentinc/cp-enterprise-control-center:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-enterprise-control-center:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   tls:
     autoGeneratedCerts: true
diff --git a/base/cfk-components/confluent-no-auth-tls/kafka.yaml b/base/cfk-components/confluent-no-auth-tls/kafka.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 3
   image:
-    application: confluentinc/cp-server:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-server:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   configOverrides:
     server:
diff --git a/base/cfk-components/confluent-no-auth-tls/ksqldb/ksqldb.yaml b/base/cfk-components/confluent-no-auth-tls/ksqldb/ksqldb.yaml
@@ -6,8 +6,8 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-ksqldb-server:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-ksqldb-server:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   tls:
     autoGeneratedCerts: true
diff --git a/base/cfk-components/confluent-no-auth-tls/schema-registry/schema-registry.yaml b/base/cfk-components/confluent-no-auth-tls/schema-registry/schema-registry.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-schema-registry:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-schema-registry:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   tls:
     autoGeneratedCerts: true
   dependencies:
diff --git a/base/cfk-components/confluent-no-auth-tls/zookeeper.yaml b/base/cfk-components/confluent-no-auth-tls/zookeeper.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 3
   image:
-    application: confluentinc/cp-zookeeper:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-zookeeper:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   logVolumeCapacity: 10Gi
   tls:
diff --git a/base/cfk-components/confluent-rbac/connect/kafka-connect.yaml b/base/cfk-components/confluent-rbac/connect/kafka-connect.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-server-connect:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-server-connect:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   tls:
     autoGeneratedCerts: true
   authorization:
diff --git a/base/cfk-components/confluent-rbac/control-centre-testadmin-rb.yaml b/base/cfk-components/confluent-rbac/control-centre-testadmin-rb.yaml
@@ -0,0 +1,22 @@
+---
+apiVersion: platform.confluent.io/v1beta1
+kind: ConfluentRolebinding
+metadata:
+  name: testadmin-rb
+spec:
+  principal:
+    type: user
+    name: testadmin
+  role: ClusterAdmin
+---
+apiVersion: platform.confluent.io/v1beta1
+kind: ConfluentRolebinding
+metadata:
+  name: testadmin-rb-sr
+spec:
+  principal:
+    type: user
+    name: testadmin
+  clustersScopeByIds:
+    schemaRegistryClusterId: id_registry_sandbox
+  role: SystemAdmin
diff --git a/base/cfk-components/confluent-rbac/control-centre.yaml b/base/cfk-components/confluent-rbac/control-centre.yaml
@@ -11,8 +11,8 @@ spec:
         failureThreshold: 5
         timeoutSeconds: 500
   image:
-    application: confluentinc/cp-enterprise-control-center:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-enterprise-control-center:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   tls:
     autoGeneratedCerts: true
diff --git a/base/cfk-components/confluent-rbac/kafka.yaml b/base/cfk-components/confluent-rbac/kafka.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 3
   image:
-    application: confluentinc/cp-server:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-server:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   tls:
     autoGeneratedCerts: true
diff --git a/base/cfk-components/confluent-rbac/ksqldb/ksqldb.yaml b/base/cfk-components/confluent-rbac/ksqldb/ksqldb.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-ksqldb-server:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-ksqldb-server:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   tls:
     autoGeneratedCerts: true
diff --git a/base/cfk-components/confluent-rbac/kustomization.yaml b/base/cfk-components/confluent-rbac/kustomization.yaml
@@ -5,6 +5,8 @@ resources:
   - secrets
   - zookeeper.yaml
   - kafka.yaml
+  - schema-registry
   - control-centre.yaml
   - rest-class.yaml
+  - control-centre-testadmin-rb.yaml
 
diff --git a/base/cfk-components/confluent-rbac/rest-class.yaml b/base/cfk-components/confluent-rbac/rest-class.yaml
@@ -6,5 +6,5 @@ spec:
   kafkaRest:
     authentication:
       type: bearer
-      basic:
-        secretRef: credential
+      bearer:
+        secretRef: credential
diff --git a/base/cfk-components/confluent-rbac/rest-proxy/restproxy.yaml b/base/cfk-components/confluent-rbac/rest-proxy/restproxy.yaml
@@ -4,8 +4,8 @@ metadata:
   name: kafkarestproxy
 spec:
   image:
-    application: confluentinc/cp-kafka-rest:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-kafka-rest:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   replicas: 1
   tls:
     autoGeneratedCerts: true
diff --git a/base/cfk-components/confluent-rbac/schema-registry/schema-registry.yaml b/base/cfk-components/confluent-rbac/schema-registry/schema-registry.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 1
   image:
-    application: confluentinc/cp-schema-registry:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-schema-registry:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   tls:
     autoGeneratedCerts: true
   authorization:
diff --git a/base/cfk-components/confluent-rbac/zookeeper.yaml b/base/cfk-components/confluent-rbac/zookeeper.yaml
@@ -5,8 +5,8 @@ metadata:
 spec:
   replicas: 3
   image:
-    application: confluentinc/cp-zookeeper:7.1.0
-    init: confluentinc/confluent-init-container:2.3.0
+    application: confluentinc/cp-zookeeper:7.2.0
+    init: confluentinc/confluent-init-container:2.4.0
   dataVolumeCapacity: 10Gi
   logVolumeCapacity: 10Gi
   tls:
