Merge pull request #10 from osodevops/confluent_upgrade

Confluent upgrade

Author: sionsmith

README.md

@@ -150,7 +150,7 @@ File a GitHub [issue](https://github.com/osodevops/kafka-gitops-examples/issues)
 
 ## The legals
 
-Copyright © 2017-2021 [OSO](https://oso.sh) | See [LICENCE](LICENSE) for full details.
+Copyright © 2017-2022 [OSO](https://oso.sh) | See [LICENCE](LICENSE) for full details.
 
 [<img src="https://oso-public-resources.s3.eu-west-1.amazonaws.com/oso-logo-green.png" alt="OSO who we are" width="250"/>](https://oso.sh/who-we-are/)
 

flux-system/gotk-sync.yaml

@@ -26,7 +26,7 @@ spec:
     - apiVersion: helm.toolkit.fluxcd.io/v1beta1
       kind: HelmRelease
       name: confluent
-      namespace: sandbox
+      namespace: confluent
   validation: client
 ---
 apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
@@ -38,7 +38,7 @@ spec:
   dependsOn:
     - name: confluent-infra
   interval: 5m
-  path: ./kustomize/environments/sandbox
+  path: ./kustomize/environments
   prune: true
   sourceRef:
     kind: GitRepository

kustomize/base/confluent/ca-pair-sslcerts.yaml

@@ -1,12 +1,18 @@
+---
 apiVersion: platform.confluent.io/v1beta1
 kind: Connect
 metadata:
   name: connect
 spec:
+  replicas: 1
+  image:
+    application: confluentinc/cp-server-connect:7.1.0
+    init: confluentinc/confluent-init-container:2.3.0
   tls:
     autoGeneratedCerts: true
   dependencies:
     kafka:
-      bootstrapEndpoint: kafka.sandbox.svc.cluster.local:9071
+      bootstrapEndpoint: kafka:9071
       tls:
         enabled: true
+

kustomize/environments/sandbox/kafka-connect.yaml renamed to kustomize/base/confluent/connect/kafka-connect.yaml

@@ -0,0 +1,5 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - kafka-connect.yaml
+

kustomize/base/confluent/connect/kustomization.yaml

@@ -1,3 +1,4 @@
+---
 apiVersion: platform.confluent.io/v1beta1
 kind: ControlCenter
 metadata:
@@ -11,6 +12,27 @@ spec:
         failureThreshold: 5
         timeoutSeconds: 500
   image:
-    application: confluentinc/cp-enterprise-control-center-operator:6.1.1.0
-    init: confluentinc/cp-init-container-operator:6.1.1.0
-  dataVolumeCapacity: 10Gi
+    application: confluentinc/cp-enterprise-control-center:7.1.0
+    init: confluentinc/confluent-init-container:2.3.0
+  dataVolumeCapacity: 10Gi
+  tls:
+    autoGeneratedCerts: true
+  dependencies:
+    kafka:
+      bootstrapEndpoint: kafka:9071
+      tls:
+        enabled: true
+    connect:
+      - name: connect
+        url:  https://connect:8083
+        tls:
+          enabled: true
+    ksqldb:
+      - name: ksqldb
+        url:  https://ksqldb:8088
+        tls:
+          enabled: true
+    schemaRegistry:
+      url: https://schemaregistry:8081
+      tls:
+        enabled: true

kustomize/base/confluent/control-centre.yaml

@@ -5,6 +5,23 @@ metadata:
 spec:
   replicas: 3
   image:
-    application: confluentinc/cp-server-operator:6.1.1.0
-    init: confluentinc/cp-init-container-operator:6.1.1.0
+    application: confluentinc/cp-server:7.1.0
+    init: confluentinc/confluent-init-container:2.3.0
   dataVolumeCapacity: 10Gi
+  configOverrides:
+    server:
+      - confluent.schema.registry.url=https://schemaregistry:8081
+  tls:
+    autoGeneratedCerts: true
+  listeners:
+    internal:
+      tls:
+        enabled: true
+    external:
+      tls:
+        enabled: true
+  dependencies:
+    zookeeper:
+      endpoint: zookeeper:2182
+      tls:
+        enabled: true

kustomize/base/confluent/kafka-connect.yaml

@@ -0,0 +1,18 @@
+---
+apiVersion: platform.confluent.io/v1beta1
+kind: KsqlDB
+metadata:
+  name: ksqldb
+spec:
+  replicas: 1
+  image:
+    application: confluentinc/cp-ksqldb-server:7.1.0
+    init: confluentinc/confluent-init-container:2.3.0
+  dataVolumeCapacity: 10Gi
+  tls:
+    autoGeneratedCerts: true
+  dependencies:
+    kafka:
+      bootstrapEndpoint: kafka:9071
+      tls:
+        enabled: true