Skip to content

Commit 1bfbe04

Browse files
sionsmithsionsmith
authored
Merge pull request #10 from osodevops/confluent_upgrade
Confluent upgrade
2 parents 707b754 + eed2498 commit 1bfbe04

33 files changed

+149
-152
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ File a GitHub [issue](https://github.com/osodevops/kafka-gitops-examples/issues)
150150

151151
## The legals
152152

153-
Copyright © 2017-2021 [OSO](https://oso.sh) | See [LICENCE](LICENSE) for full details.
153+
Copyright © 2017-2022 [OSO](https://oso.sh) | See [LICENCE](LICENSE) for full details.
154154

155155
[<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/)
156156

‎flux-system/gotk-sync.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
- apiVersion: helm.toolkit.fluxcd.io/v1beta1
2727
kind: HelmRelease
2828
name: confluent
29-
namespace: sandbox
29+
namespace: confluent
3030
validation: client
3131
---
3232
apiVersion: kustomize.toolkit.fluxcd.io/v1beta1
@@ -38,7 +38,7 @@ spec:
3838
dependsOn:
3939
- name: confluent-infra
4040
interval: 5m
41-
path: ./kustomize/environments/sandbox
41+
path: ./kustomize/environments
4242
prune: true
4343
sourceRef:
4444
kind: GitRepository

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

-8
This file was deleted.

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

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,18 @@
1+
---
12
apiVersion: platform.confluent.io/v1beta1
23
kind: Connect
34
metadata:
45
name: connect
56
spec:
7+
replicas: 1
8+
image:
9+
application: confluentinc/cp-server-connect:7.1.0
10+
init: confluentinc/confluent-init-container:2.3.0
611
tls:
712
autoGeneratedCerts: true
813
dependencies:
914
kafka:
10-
bootstrapEndpoint: kafka.sandbox.svc.cluster.local:9071
15+
bootstrapEndpoint: kafka:9071
1116
tls:
1217
enabled: true
18+

‎kustomize/base/confluent/connect/kustomization.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- kafka-connect.yaml
5+

‎kustomize/base/confluent/control-centre.yaml

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
apiVersion: platform.confluent.io/v1beta1
23
kind: ControlCenter
34
metadata:
@@ -11,6 +12,27 @@ spec:
1112
failureThreshold: 5
1213
timeoutSeconds: 500
1314
image:
14-
application: confluentinc/cp-enterprise-control-center-operator:6.1.1.0
15-
init: confluentinc/cp-init-container-operator:6.1.1.0
16-
dataVolumeCapacity: 10Gi
15+
application: confluentinc/cp-enterprise-control-center:7.1.0
16+
init: confluentinc/confluent-init-container:2.3.0
17+
dataVolumeCapacity: 10Gi
18+
tls:
19+
autoGeneratedCerts: true
20+
dependencies:
21+
kafka:
22+
bootstrapEndpoint: kafka:9071
23+
tls:
24+
enabled: true
25+
connect:
26+
- name: connect
27+
url: https://connect:8083
28+
tls:
29+
enabled: true
30+
ksqldb:
31+
- name: ksqldb
32+
url: https://ksqldb:8088
33+
tls:
34+
enabled: true
35+
schemaRegistry:
36+
url: https://schemaregistry:8081
37+
tls:
38+
enabled: true

‎kustomize/base/confluent/kafka-connect.yaml

-9
This file was deleted.

‎kustomize/base/confluent/kafka.yaml

+19-2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,23 @@ metadata:
55
spec:
66
replicas: 3
77
image:
8-
application: confluentinc/cp-server-operator:6.1.1.0
9-
init: confluentinc/cp-init-container-operator:6.1.1.0
8+
application: confluentinc/cp-server:7.1.0
9+
init: confluentinc/confluent-init-container:2.3.0
1010
dataVolumeCapacity: 10Gi
11+
configOverrides:
12+
server:
13+
- confluent.schema.registry.url=https://schemaregistry:8081
14+
tls:
15+
autoGeneratedCerts: true
16+
listeners:
17+
internal:
18+
tls:
19+
enabled: true
20+
external:
21+
tls:
22+
enabled: true
23+
dependencies:
24+
zookeeper:
25+
endpoint: zookeeper:2182
26+
tls:
27+
enabled: true

‎kustomize/base/confluent/ksqldb.yaml

-10
This file was deleted.

‎kustomize/base/confluent/ksqldb/ksqldb.yaml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
apiVersion: platform.confluent.io/v1beta1
3+
kind: KsqlDB
4+
metadata:
5+
name: ksqldb
6+
spec:
7+
replicas: 1
8+
image:
9+
application: confluentinc/cp-ksqldb-server:7.1.0
10+
init: confluentinc/confluent-init-container:2.3.0
11+
dataVolumeCapacity: 10Gi
12+
tls:
13+
autoGeneratedCerts: true
14+
dependencies:
15+
kafka:
16+
bootstrapEndpoint: kafka:9071
17+
tls:
18+
enabled: true

‎kustomize/base/confluent/ksqldb/kustomization.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- ksqldb.yaml
5+

‎kustomize/base/confluent/kustomization.yaml

+2-6
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4+
- secrets
45
- zookeeper.yaml
5-
- kafka.yaml
6-
- kafka-connect.yaml
7-
- schema-registry.yaml
8-
- control-centre.yaml
9-
- ksqldb.yaml
10-
- ca-pair-sslcerts.yaml
6+
- kafka.yaml

‎kustomize/base/confluent/rest-class.yaml

-9
This file was deleted.

‎kustomize/base/confluent/schema-registry.yaml

-9
This file was deleted.

‎kustomize/base/confluent/schmea-registry/kustomization.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- schema-registry.yaml
5+

‎kustomize/environments/sandbox/schema-registry.yaml renamed to ‎kustomize/base/confluent/schmea-registry/schema-registry.yaml

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,14 @@ kind: SchemaRegistry
33
metadata:
44
name: schemaregistry
55
spec:
6+
replicas: 1
7+
image:
8+
application: confluentinc/cp-schema-registry:7.1.0
9+
init: confluentinc/confluent-init-container:2.3.0
610
tls:
711
autoGeneratedCerts: true
812
dependencies:
913
kafka:
10-
bootstrapEndpoint: kafka.sandbox.svc.cluster.local:9071
14+
bootstrapEndpoint: kafka:9071
1115
tls:
1216
enabled: true

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

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: v1
2+
data:
3+
tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURtRENDQW9DZ0F3SUJBZ0lVSEZEYWdiZ0Y4bTg0NzhoUEJpTktGOGI5MHVzd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1pERVJNQThHQTFVRUJoTUlWVzVwZG1WeWMyVXhEekFOQmdOVkJBZ1RCbEJoYm1kbFlURU9NQXdHQTFVRQpCeE1GUldGeWRHZ3hEVEFMQmdOVkJBb1RCRUZqYldVeERqQU1CZ05WQkFzVEJVMTVUM0puTVE4d0RRWURWUVFECkV3WlVaWE4wUTBFd0hoY05NakV3T0RFMk1USXhPREF3V2hjTk1qWXdPREUxTVRJeE9EQXdXakJrTVJFd0R3WUQKVlFRR0V3aFZibWwyWlhKelpURVBNQTBHQTFVRUNCTUdVR0Z1WjJWaE1RNHdEQVlEVlFRSEV3VkZZWEowYURFTgpNQXNHQTFVRUNoTUVRV050WlRFT01Bd0dBMVVFQ3hNRlRYbFBjbWN4RHpBTkJnTlZCQU1UQmxSbGMzUkRRVENDCkFTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSzZ6NzJNbithSElYZ1RkODVqdi8rMm4KT0daQU9ITWhOQ2J2V1Y1cWVlTlgwaXZIZVhtRkF4TmFSc2ZKbGhOUllpTVRLRTRoUjZreTdEUWxFbVZLQ1g0cwpnaExYZ28wU3pUV3BhNkltcmFIbnplQWhob1gyaWxFdjRvUVVxMVFDdHhRd0NhVmxLYXhCM1pLNExzVVFuZlRqClBFL3JtQURwd2UxSjlteWxLeDJuNEl1V2NNRjE5dlBFdjc4dTdXU0FDNUQzdXVjTUwwRzByZys3K0srTXRQV1EKSk9UcWp2MHR6RGt4UXg0NmVlL042eFI0czdKbVRHc29SeC9KRDVOVUozNTJYYTFrNHhSUVltRnJ0U0V4UTBPUgpWSVNhYnQ2ZzA5L1NqQ0JrQTRWb0NoazBXL0o0K0k1VGR0clh0ZUpaTVBrWlhKMkxvS3hXM0NCVW0vRG9xUXNDCkF3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0VHTUE4R0ExVWRFd0VCL3dRRk1BTUJBZjh3SFFZRFZSME8KQkJZRUZOSFRzcEFlcURDVFUwMDB5SGU0ZzlEMURrcXNNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUF3VFErOApzTExxbURpV2RSeTZrOThyWWpPR3RXVW10ZWVSNDhNRWxQR3RSZ3BLWFhjcTBaSnd5ZHd3VTVZKzhuL3lyYW5UCmQzUWxEOWR5MDlZNHhYbDFkR2FhbWw0ZXE4cFZWQm04WE9kVkNaWnR3WjNHQ0I1NFdrQ2RHdnFIS3hnclVzb1IKMC9UYU15TVNXbmZMdk9XNHhLOXpQanAxYUc1eDdGeFJybW5OVjRUTHE5UFpOa3krK3Y2Y2dyNTF4OXdPOVNHaQpGTHBJOE9yTkdVeWxuZGhVMGFYSzRnZUFwZXh2cEJDNjdqY1Y4Nmo4emxKNkJaMnRRQXA0ZDFBeGVVQjROdmVsCmg3TFRCS0toemRER2lWUTFWYStoR1pGaE1GeXUxTzUrbVhzaUFwOTc1UEZ2S1pLMWJaeC90WjdMZjRSdXZpUjgKRHBQRUpMT2c1TXpQb2FFLwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
4+
tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBcnJQdll5ZjVvY2hlQk4zem1PLy83YWM0WmtBNGN5RTBKdTlaWG1wNTQxZlNLOGQ1CmVZVURFMXBHeDhtV0UxRmlJeE1vVGlGSHFUTHNOQ1VTWlVvSmZpeUNFdGVDalJMTk5hbHJvaWF0b2VmTjRDR0cKaGZhS1VTL2loQlNyVkFLM0ZEQUpwV1VwckVIZGtyZ3V4UkNkOU9NOFQrdVlBT25CN1VuMmJLVXJIYWZnaTVadwp3WFgyODhTL3Z5N3RaSUFMa1BlNjV3d3ZRYlN1RDd2NHI0eTA5WkFrNU9xTy9TM01PVEZESGpwNTc4M3JGSGl6CnNtWk1heWhISDhrUGsxUW5mblpkcldUakZGQmlZV3UxSVRGRFE1RlVoSnB1M3FEVDM5S01JR1FEaFdnS0dUUmIKOG5qNGpsTjIydGUxNGxrdytSbGNuWXVnckZiY0lGU2I4T2lwQ3dJREFRQUJBb0lCQUg1T2pTYXRRaWdiaXc0Tgp3ZzZ5aGVBMlkrcFpSL2JFN01XeGluVmVtZDBxSTBPUHBsMmJNd3dNMnR1YS9TdmVUUXQ2MEVzY2VJajF6aHd0CktVMmQ1NXNYWnJ0a29IaUtQVjhzckNyQnVBczBZbjVHL3RGZjI4U3kwQndhTFh4QnNrZWdLM2t1MktBM3hwQkwKSlZWSW5FcnU5eTM0OFI3SDRuTkNaQzFNaFEyY25SeFluc0Y0c2JxYWtvVHhMa08waTh3OXIwSXIwKzZIK0tJLwpjeUFWaWJuUi80L2VxODh0UDRhT0RrazZ0cUsweTk2S2ZqTEdpbGdsWW9CemUyK1AvNHhrSHlJYXZHd3ZCdllNCkgrc042OGhNbnhXbzg0cVp1RENROWJkOTA3MFV2d1NOc2ZNNkRBL3NBYWVTb0VSeHE4Z0xpSlhXZVZXQ3JNKzEKMFdrQTZJRUNnWUVBNXR4dStTZk0ra2NtM1hoMitKUWlIeERVNC9oankvYlBpV2k2d3ZjR2tFVksvRGQxZHlWQwprYUVjT05oblBFNytCZ21YbWVQdno3dG9nTmtrK2FncGY4L1JQVmFvNUQxemZSNkZESGU5QnBWWjRxUDdzYzk4CjFHRC9vVzFDaWVvUmVyQVlMM1BVWktIZ0g1a0ltR21ZR3owSUVxa0ZzeHl5bG4vVkc1T2ZoT0VDZ1lFQXdib0QKOUJKWGwxK3dUVHdPRE9KclFzZlFUc0lxR1pzZUtMYlM3cGwvT29mUWxCd0ZYN0VrV0RFejE4ZjV1MUEvUnhaSApCeUNTY2tiZW5GbXhFR0Zpa2Foc05EaGhzRWw3blpveDlDcWJFWXJwY08rUWRTTmlSSDBralpLdTladnd6VERxCmhMclV4b2Irbm5WdFFqenZCNmYrZThCc052UkJIY1hxUkhQZy8yc0NnWUFmaHY4SXU2eThpVGIvaTlJRGhJZGMKWXJvUUgvM1Evdlc4dURhNUpXOGFDTHlDMFRnVGUxMHA4aXllZnI4cWQwY3RuK1c2T0d5cG05aGJzRXZpWkZxMgpmN1Q5Z1hZekpVaytUd3F3ZHpHelVuWWlBMjcrQzIzcXV3eHVDVFBMRGRJeFJSY29jOU1Qb3lPdWJRSEZmcll0CkVocW1JYnNMaU9IQ3Q5WnNtNjV2UVFLQmdEa0tyWmxUUVVsSUdxQlRPNHZkcTFtSmZqT0NobVR0d0s2YVRuZUUKNk9weURSOWZOTkhkVmVkRjdZN3V5Z0MyZXp0U091M0ZVSG1ubG1xUkdrckpjZjJUaXZEQlhUcE1HTUxxSVNWVQoyajRMR2Z0di9xZ1BHQ00wZWV2WnNmeU53eFNYLzZXL1lXRm5aRmVDR2Y2ejlHbmJ0Rm41NmFNd3ZtK20wL2o5CjZkVXJBb0dCQUt2a0UrcnQ4MldRbjQydTNaei9aa3RMNHhLM3FKU3lDR0kycnpPQUtDTm92M1FPWlpiVVdqTDAKaTBYeVA5dFRDMnJYRDhZelVUblYzbUM5YjlGUkI5UFZ4OHY0OTllQjJaYTNiY29CRERpVU9VT0NsTlc5VElqWgpFNnFCSm5aY21QTllqZXl3UFE3aFFhbU1NUnA1MWlOeUVZYTVGOXFuU3hhcUN1cjRsaUN6Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
5+
kind: Secret
6+
metadata:
7+
name: ca-pair-sslcerts
8+
type: kubernetes.io/tls

‎kustomize/base/confluent/secrets/kustomization.yaml

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
resources:
4+
- ca-pair-sslcerts.yaml
5+
- mds-public.yaml

‎kustomize/base/confluent/secrets/mds-public.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: v1
2+
data:
3+
mdsPublicKey.pem: LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF3TXlqblA0cWZkVEtoQ1M1c1BiVgpxaVhWeVExNXdyZVZBc0VxRXNuTUZ0Mkp0TUwxM0VMT1Eyc3pXbjU3V3p1NzgyYnlFdFlGbEYzVG9WVzNjbDRkCk9KUnphU0VRNnhlMTBSL2k3VG5lSXRFUWZwSnIvMkw0YnVidVFSR05lL0tyTE1FMGl2cjl1NElFYmJSUytsdHUKNkE5Z2d6R2NhRFN4Vi9leUtNTlBhZEhRL0FONEJaaWpBZUtaY0RUano2YkhqSjZFUTNZTmdxeW44NDZyZVFrOQpUb0habDhiR0hPaHo1Qzd5b0lmc3haZ1lIbG54NkpHc2lVWjVQMzZXR2MzOFpJQi9tNDVvOGN2NGlmVVZQVUIwCklRUTlBaFlJNVp1TXJ4RHNSUERYMkdHNkU1YlcydnFEV3lxWE9ZN2NTb0k3QWlrRmR3QVRXNFJ2N2V1RUpVeXoKTndJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t
4+
kind: Secret
5+
metadata:
6+
creationTimestamp: null
7+
name: mds-public

‎kustomize/base/confluent/zookeeper.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ metadata:
55
spec:
66
replicas: 3
77
image:
8-
application: confluentinc/cp-zookeeper-operator:6.1.1.0
9-
init: confluentinc/cp-init-container-operator:6.1.1.0
8+
application: confluentinc/cp-zookeeper:7.1.0
9+
init: confluentinc/confluent-init-container:2.3.0
1010
dataVolumeCapacity: 10Gi
1111
logVolumeCapacity: 10Gi
12+
tls:
13+
autoGeneratedCerts: true

‎kustomize/environments/kustomization.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
resources:
24
- sandbox
5+
- production

‎kustomize/environments/production/kustomization.yaml

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: production
4+
resources:
5+
- namespace.yaml
6+
- ../../base
7+
- ../../base/confluent/connect
8+
- ../../base/confluent/control-centre.yaml

‎kustomize/environments/production/namespace.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: production

‎kustomize/environments/sandbox/control-centre.yaml

-27
This file was deleted.

‎kustomize/environments/sandbox/kafka.yaml

-23
This file was deleted.

‎kustomize/environments/sandbox/ksqldb.yaml

-13
This file was deleted.

‎kustomize/environments/sandbox/kustomization.yaml

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
13
namespace: sandbox
24
resources:
3-
- ../../base
4-
patchesStrategicMerge:
5-
- control-centre.yaml
6-
- kafka.yaml
7-
- kafka-connect.yaml
8-
- ksqldb.yaml
9-
- schema-registry.yaml
10-
- zookeeper.yaml
5+
- namespace.yaml
6+
- ../../base
7+
- ../../base/confluent/schmea-registry

‎kustomize/environments/sandbox/namespace.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: sandbox

‎kustomize/environments/sandbox/zookeeper.yaml

-7
This file was deleted.

‎kustomize/operator/confluent-operator-helm-release-confluent.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ apiVersion: helm.toolkit.fluxcd.io/v2beta1
1111
kind: HelmRelease
1212
metadata:
1313
name: confluent
14-
namespace: sandbox
14+
namespace: confluent
1515
spec:
1616
interval: 1m
1717
chart:
@@ -32,6 +32,7 @@ spec:
3232
force: true
3333
cleanupOnFail: true
3434
values:
35+
namespaced: false
3536
image:
3637
registry: docker.io
3738
name: confluent-operator-global

0 commit comments

Comments
 (0)