From b467eee652b1cfcdea241ff95aa1eb843d04c1a3 Mon Sep 17 00:00:00 2001 From: Sion Smith Date: Fri, 6 May 2022 13:15:39 +0100 Subject: [PATCH 01/11] Quota client image --- stable/quotas/client/demo-topic.yaml | 11 +++++++++++ stable/quotas/docker/Dockerfile | 17 +++++++++++++++++ stable/quotas/docker/build-inside.sh | 3 +++ stable/quotas/docker/confluent.repo | 13 +++++++++++++ stable/quotas/kustomization.yaml | 15 +++++++++++++++ stable/quotas/namespace.yaml | 4 ++++ 6 files changed, 63 insertions(+) create mode 100644 stable/quotas/client/demo-topic.yaml create mode 100644 stable/quotas/docker/Dockerfile create mode 100755 stable/quotas/docker/build-inside.sh create mode 100644 stable/quotas/docker/confluent.repo create mode 100644 stable/quotas/kustomization.yaml create mode 100644 stable/quotas/namespace.yaml diff --git a/stable/quotas/client/demo-topic.yaml b/stable/quotas/client/demo-topic.yaml new file mode 100644 index 0000000..eac60c5 --- /dev/null +++ b/stable/quotas/client/demo-topic.yaml @@ -0,0 +1,11 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: KafkaTopic +metadata: + name: oso-clusterlink-demo +spec: + replicas: 3 + partitionCount: 4 + configs: + cleanup.policy: "delete" + kafkaRestClassRef: + name: production-kafka-rest \ No newline at end of file diff --git a/stable/quotas/docker/Dockerfile b/stable/quotas/docker/Dockerfile new file mode 100644 index 0000000..6caee6f --- /dev/null +++ b/stable/quotas/docker/Dockerfile @@ -0,0 +1,17 @@ +FROM rockylinux/rockylinux:8.5 + +ENV container docker + +# 1. Adding Confluent repository +RUN rpm --import https://packages.confluent.io/rpm/7.1/archive.key +COPY confluent.repo /etc/yum.repos.d/confluent.repo +RUN yum clean all + +# 2. Install Confluent Kafka stack +RUN yum install -y java-1.8.0-openjdk +RUN yum install -y confluent-kafka + +# 3. Install JY YAML parser for shell +RUN yum install -y jq +RUN curl -L -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/`curl -s https://api.github.com/repos/mikefarah/yq/releases/latest | jq .tag_name | sed 's/"//g'`/yq_linux_amd64 +RUN chmod 755 /usr/local/bin/yq \ No newline at end of file diff --git a/stable/quotas/docker/build-inside.sh b/stable/quotas/docker/build-inside.sh new file mode 100755 index 0000000..1953a1c --- /dev/null +++ b/stable/quotas/docker/build-inside.sh @@ -0,0 +1,3 @@ +#!/bin/bash +eval $(minikube docker-env) +docker build -t sandbox-kafka-client . \ No newline at end of file diff --git a/stable/quotas/docker/confluent.repo b/stable/quotas/docker/confluent.repo new file mode 100644 index 0000000..5fd3e1f --- /dev/null +++ b/stable/quotas/docker/confluent.repo @@ -0,0 +1,13 @@ +[Confluent] +name=Confluent repository +baseurl=https://packages.confluent.io/rpm/7.1 +gpgcheck=1 +gpgkey=https://packages.confluent.io/rpm/7.1/archive.key +enabled=1 + +[Confluent-Clients] +name=Confluent Clients repository +baseurl=https://packages.confluent.io/clients/rpm/centos/$releasever/$basearch +gpgcheck=1 +gpgkey=https://packages.confluent.io/clients/rpm/archive.key +enabled=1 \ No newline at end of file diff --git a/stable/quotas/kustomization.yaml b/stable/quotas/kustomization.yaml new file mode 100644 index 0000000..0644120 --- /dev/null +++ b/stable/quotas/kustomization.yaml @@ -0,0 +1,15 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: sandbox +resources: +- namespace.yaml +- ../../base/cfk-components/confluent-no-auth-tls +- ./schema-config.yaml +- ./schema.yaml + +configMapGenerator: + - name: oso-schema-config + files: + - schema=new_customer.avsc + options: + disableNameSuffixHash: true \ No newline at end of file diff --git a/stable/quotas/namespace.yaml b/stable/quotas/namespace.yaml new file mode 100644 index 0000000..6b30586 --- /dev/null +++ b/stable/quotas/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: sandbox From ec5badf16729c6e839c8a07530e80206402713db Mon Sep 17 00:00:00 2001 From: Sion Smith Date: Tue, 10 May 2022 11:52:35 +0100 Subject: [PATCH 02/11] Quota client image --- stable/quotas/client/demo-topic.yaml | 4 +- stable/quotas/client/kustomization.yaml | 4 ++ stable/quotas/client/quota-manager.yaml | 75 +++++++++++++++++++++++++ stable/quotas/confluent/kafka.yaml | 14 +++++ stable/quotas/kustomization.yaml | 14 ++--- 5 files changed, 98 insertions(+), 13 deletions(-) create mode 100644 stable/quotas/client/kustomization.yaml create mode 100644 stable/quotas/client/quota-manager.yaml create mode 100644 stable/quotas/confluent/kafka.yaml diff --git a/stable/quotas/client/demo-topic.yaml b/stable/quotas/client/demo-topic.yaml index eac60c5..c6a3295 100644 --- a/stable/quotas/client/demo-topic.yaml +++ b/stable/quotas/client/demo-topic.yaml @@ -6,6 +6,4 @@ spec: replicas: 3 partitionCount: 4 configs: - cleanup.policy: "delete" - kafkaRestClassRef: - name: production-kafka-rest \ No newline at end of file + cleanup.policy: "delete" \ No newline at end of file diff --git a/stable/quotas/client/kustomization.yaml b/stable/quotas/client/kustomization.yaml new file mode 100644 index 0000000..661ac71 --- /dev/null +++ b/stable/quotas/client/kustomization.yaml @@ -0,0 +1,4 @@ +namespace: sandbox +resources: +- demo-topic.yaml +- quota-manager.yaml \ No newline at end of file diff --git a/stable/quotas/client/quota-manager.yaml b/stable/quotas/client/quota-manager.yaml new file mode 100644 index 0000000..51269da --- /dev/null +++ b/stable/quotas/client/quota-manager.yaml @@ -0,0 +1,75 @@ +--- +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: quota-manager + namespace: sandbox +spec: + serviceName: quota-manager + podManagementPolicy: OrderedReady + replicas: 1 + selector: + matchLabels: + app: quota-manager + template: + metadata: + labels: + app: quota-manager + spec: + containers: + - name: quota-manager + image: sandbox-kafka-client:latest + imagePullPolicy: Never + command: + - /tmp/quotas/apply-quotas-script.sh + resources: + requests: + memory: 512Mi # 768Mi + cpu: 500m # 1000m + volumeMounts: + - mountPath: /tmp/quotas + name: apply-quotas-script + - mountPath: /mnt/sslcerts + name: sslcerts + volumes: + - name: apply-quotas-script + configMap: + defaultMode: 0777 + name: apply-quotas-script + - name: sslcerts + secret: + secretName: kafka-generated-jks +--- +apiVersion: v1 +kind: Service +metadata: + name: quota-manager + namespace: sandbox +spec: + clusterIP: None +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: apply-quotas-script +data: + apply-quotas-script.sh: |- + #!/bin/bash + populate_properties() { + tee -a /tmp/command.properties < Date: Tue, 10 May 2022 11:57:33 +0100 Subject: [PATCH 03/11] renamed directory --- stable/quotas/{client => quota-manager}/demo-topic.yaml | 0 stable/quotas/{client => quota-manager}/kustomization.yaml | 0 stable/quotas/{client => quota-manager}/quota-manager.yaml | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename stable/quotas/{client => quota-manager}/demo-topic.yaml (100%) rename stable/quotas/{client => quota-manager}/kustomization.yaml (100%) rename stable/quotas/{client => quota-manager}/quota-manager.yaml (100%) diff --git a/stable/quotas/client/demo-topic.yaml b/stable/quotas/quota-manager/demo-topic.yaml similarity index 100% rename from stable/quotas/client/demo-topic.yaml rename to stable/quotas/quota-manager/demo-topic.yaml diff --git a/stable/quotas/client/kustomization.yaml b/stable/quotas/quota-manager/kustomization.yaml similarity index 100% rename from stable/quotas/client/kustomization.yaml rename to stable/quotas/quota-manager/kustomization.yaml diff --git a/stable/quotas/client/quota-manager.yaml b/stable/quotas/quota-manager/quota-manager.yaml similarity index 100% rename from stable/quotas/client/quota-manager.yaml rename to stable/quotas/quota-manager/quota-manager.yaml From 124676a1c9eb93154466cef36b5cf85349f8179e Mon Sep 17 00:00:00 2001 From: Andrew McCully Date: Tue, 10 May 2022 15:23:35 +0100 Subject: [PATCH 04/11] working bash script to add quotas --- stable/quotas/confluent/kafka.yaml | 14 ----- stable/quotas/docker/Dockerfile | 21 ++----- stable/quotas/docker/build-inside.sh | 2 +- stable/quotas/docker/confluent.repo | 13 ----- stable/quotas/kustomization.yaml | 4 +- .../definition/apply-quotas-script.sh | 36 ++++++++++++ .../quota-manager/definition/kafka.properties | 6 ++ .../quota-manager/definition/quotas.yaml | 12 ++++ stable/quotas/quota-manager/demo-topic.yaml | 9 --- .../quotas/quota-manager/kustomization.yaml | 15 ++++- .../quotas/quota-manager/quota-manager.yaml | 56 ++++++------------- 11 files changed, 92 insertions(+), 96 deletions(-) delete mode 100644 stable/quotas/confluent/kafka.yaml delete mode 100644 stable/quotas/docker/confluent.repo create mode 100644 stable/quotas/quota-manager/definition/apply-quotas-script.sh create mode 100644 stable/quotas/quota-manager/definition/kafka.properties create mode 100644 stable/quotas/quota-manager/definition/quotas.yaml delete mode 100644 stable/quotas/quota-manager/demo-topic.yaml diff --git a/stable/quotas/confluent/kafka.yaml b/stable/quotas/confluent/kafka.yaml deleted file mode 100644 index 7278629..0000000 --- a/stable/quotas/confluent/kafka.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: Kafka -metadata: - name: kafka -spec: - configOverrides: - server: - - confluent.schema.registry.url=https://schemaregistry:8081 - - listener.name.internal.plain.sasl.server.callback.handler.class=io.confluent.security.auth.provider.ldap.LdapAuthenticateCallbackHandler - - listener.name.external.plain.sasl.server.callback.handler.class=io.confluent.security.auth.provider.ldap.LdapAuthenticateCallbackHandler - - listener.name.replication.plain.sasl.server.callback.handler.class=io.confluent.security.auth.provider.ldap.LdapAuthenticateCallbackHandler - - authorizer.class.name=io.confluent.kafka.security.authorizer.ConfluentServerAuthorizer - - confluent.authorizer.access.rule.providers=ZK_ACL,CONFLUENT - - password.encoder.secret="foobar" diff --git a/stable/quotas/docker/Dockerfile b/stable/quotas/docker/Dockerfile index 6caee6f..58f92bd 100644 --- a/stable/quotas/docker/Dockerfile +++ b/stable/quotas/docker/Dockerfile @@ -1,17 +1,6 @@ -FROM rockylinux/rockylinux:8.5 - -ENV container docker - -# 1. Adding Confluent repository -RUN rpm --import https://packages.confluent.io/rpm/7.1/archive.key -COPY confluent.repo /etc/yum.repos.d/confluent.repo -RUN yum clean all - -# 2. Install Confluent Kafka stack -RUN yum install -y java-1.8.0-openjdk -RUN yum install -y confluent-kafka - -# 3. Install JY YAML parser for shell -RUN yum install -y jq +FROM confluentinc/cp-kafka:latest +USER root +RUN yum install -y jq vim vi RUN curl -L -o /usr/local/bin/yq https://github.com/mikefarah/yq/releases/download/`curl -s https://api.github.com/repos/mikefarah/yq/releases/latest | jq .tag_name | sed 's/"//g'`/yq_linux_amd64 -RUN chmod 755 /usr/local/bin/yq \ No newline at end of file +RUN chmod +x /usr/local/bin/yq +USER appuser diff --git a/stable/quotas/docker/build-inside.sh b/stable/quotas/docker/build-inside.sh index 1953a1c..9c537a2 100755 --- a/stable/quotas/docker/build-inside.sh +++ b/stable/quotas/docker/build-inside.sh @@ -1,3 +1,3 @@ #!/bin/bash eval $(minikube docker-env) -docker build -t sandbox-kafka-client . \ No newline at end of file +docker build -t quota-manager . \ No newline at end of file diff --git a/stable/quotas/docker/confluent.repo b/stable/quotas/docker/confluent.repo deleted file mode 100644 index 5fd3e1f..0000000 --- a/stable/quotas/docker/confluent.repo +++ /dev/null @@ -1,13 +0,0 @@ -[Confluent] -name=Confluent repository -baseurl=https://packages.confluent.io/rpm/7.1 -gpgcheck=1 -gpgkey=https://packages.confluent.io/rpm/7.1/archive.key -enabled=1 - -[Confluent-Clients] -name=Confluent Clients repository -baseurl=https://packages.confluent.io/clients/rpm/centos/$releasever/$basearch -gpgcheck=1 -gpgkey=https://packages.confluent.io/clients/rpm/archive.key -enabled=1 \ No newline at end of file diff --git a/stable/quotas/kustomization.yaml b/stable/quotas/kustomization.yaml index bc1c779..e9373b7 100644 --- a/stable/quotas/kustomization.yaml +++ b/stable/quotas/kustomization.yaml @@ -4,6 +4,4 @@ namespace: sandbox resources: - namespace.yaml - ../../base/cfk-components/confluent-rbac -- client -patchesStrategicMerge: - - confluent/kafka.yaml \ No newline at end of file + diff --git a/stable/quotas/quota-manager/definition/apply-quotas-script.sh b/stable/quotas/quota-manager/definition/apply-quotas-script.sh new file mode 100644 index 0000000..65add84 --- /dev/null +++ b/stable/quotas/quota-manager/definition/apply-quotas-script.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +quota_definition="/tmp/quota-definition/quotas.yaml" + +for i in $(yq '.platform.quotas | keys' < $quota_definition); do + principal="${i:0}" + if [[ "$principal" != "-" ]]; then + producer_byte_rate=$(yq ".platform.quotas.$principal.producer_byte_rate" < $quota_definition) + consumer_byte_rate=$(yq ".platform.quotas.$principal.consumer_byte_rate" < $quota_definition) + request_percentage=$(yq ".platform.quotas.$principal.request_percentage" < $quota_definition) + config_string="" + if [[ "$producer_byte_rate" != "null" ]]; then + config_string="$config_string producer_byte_rate=$producer_byte_rate," + fi + if [[ "$consumer_byte_rate" != "null" ]]; then + config_string="$config_string consumer_byte_rate=$consumer_byte_rate," + fi + if [[ "$request_percentage" != "null" ]]; then + config_string="$config_string request_percentage=$request_percentage," + fi + # Removes white space and the last trailing comma + config=$(echo $config_string | tr -d " \t\n\r" | rev | cut -c 2- | rev) + set -x + echo $config + + kafka-configs \ + --bootstrap-server kafka:9071 \ + --alter \ + --entity-type users \ + --entity-name $principal \ + --command-config /tmp/config-properties/kafka.properties \ + --add-config "$config" + set +x + fi +done + diff --git a/stable/quotas/quota-manager/definition/kafka.properties b/stable/quotas/quota-manager/definition/kafka.properties new file mode 100644 index 0000000..216d2cb --- /dev/null +++ b/stable/quotas/quota-manager/definition/kafka.properties @@ -0,0 +1,6 @@ +bootstrap.servers=kafka:9071 +sasl.jaas.config=org.apache.kafka.common.security.plain.PlainLoginModule required username=kafka password=kafka-secret; +sasl.mechanism=PLAIN +security.protocol=SASL_SSL +ssl.truststore.location=/mnt/sslcerts/truststore.jks +ssl.truststore.password=mystorepassword \ No newline at end of file diff --git a/stable/quotas/quota-manager/definition/quotas.yaml b/stable/quotas/quota-manager/definition/quotas.yaml new file mode 100644 index 0000000..ccca109 --- /dev/null +++ b/stable/quotas/quota-manager/definition/quotas.yaml @@ -0,0 +1,12 @@ +--- +platform: + quotas: + app-0: + producer_byte_rate: 1024 + consumer_byte_rate: 1024 + request_percentage: 50.0 + app-2: + producer_byte_rate: 2048 + consumer_byte_rate: 2048 + app-3: + request_percentage: 80.0 \ No newline at end of file diff --git a/stable/quotas/quota-manager/demo-topic.yaml b/stable/quotas/quota-manager/demo-topic.yaml deleted file mode 100644 index c6a3295..0000000 --- a/stable/quotas/quota-manager/demo-topic.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: KafkaTopic -metadata: - name: oso-clusterlink-demo -spec: - replicas: 3 - partitionCount: 4 - configs: - cleanup.policy: "delete" \ No newline at end of file diff --git a/stable/quotas/quota-manager/kustomization.yaml b/stable/quotas/quota-manager/kustomization.yaml index 661ac71..7260bd8 100644 --- a/stable/quotas/quota-manager/kustomization.yaml +++ b/stable/quotas/quota-manager/kustomization.yaml @@ -1,4 +1,15 @@ namespace: sandbox resources: -- demo-topic.yaml -- quota-manager.yaml \ No newline at end of file +- quota-manager.yaml +configMapGenerator: +- name: oso-quota-example + files: + - ./definition/quotas.yaml +- name: config-properties + files: + - ./definition/kafka.properties +- name: apply-quota-script + files: + - ./definition/apply-quotas-script.sh +generatorOptions: + disableNameSuffixHash: true \ No newline at end of file diff --git a/stable/quotas/quota-manager/quota-manager.yaml b/stable/quotas/quota-manager/quota-manager.yaml index 51269da..ac1549e 100644 --- a/stable/quotas/quota-manager/quota-manager.yaml +++ b/stable/quotas/quota-manager/quota-manager.yaml @@ -18,9 +18,11 @@ spec: spec: containers: - name: quota-manager - image: sandbox-kafka-client:latest + image: quota-manager:latest imagePullPolicy: Never command: +# - "sleep" +# - "10000000" - /tmp/quotas/apply-quotas-script.sh resources: requests: @@ -28,48 +30,26 @@ spec: cpu: 500m # 1000m volumeMounts: - mountPath: /tmp/quotas - name: apply-quotas-script + name: apply-quota-script + - mountPath: /tmp/quota-definition + name: oso-quota-example + - mountPath: /tmp/config-properties + name: config-properties - mountPath: /mnt/sslcerts name: sslcerts volumes: - - name: apply-quotas-script + - name: config-properties configMap: defaultMode: 0777 - name: apply-quotas-script + name: config-properties + - name: oso-quota-example + configMap: + defaultMode: 0777 + name: oso-quota-example + - name: apply-quota-script + configMap: + defaultMode: 0777 + name: apply-quota-script - name: sslcerts secret: secretName: kafka-generated-jks ---- -apiVersion: v1 -kind: Service -metadata: - name: quota-manager - namespace: sandbox -spec: - clusterIP: None ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: apply-quotas-script -data: - apply-quotas-script.sh: |- - #!/bin/bash - populate_properties() { - tee -a /tmp/command.properties < Date: Tue, 10 May 2022 16:39:25 +0100 Subject: [PATCH 05/11] updated script to allow for global options --- stable/quotas/confluent/kafka.yaml | 19 ++++++++++++ stable/quotas/kustomization.yaml | 4 ++- .../apply-quotas-script.sh | 29 ++++++++++++------- .../{definition => default}/kafka.properties | 0 .../{definition => default}/quotas.yaml | 6 +++- .../quotas/quota-manager/kustomization.yaml | 6 ++-- .../quotas/quota-manager/quota-manager.yaml | 15 ++++------ 7 files changed, 54 insertions(+), 25 deletions(-) create mode 100644 stable/quotas/confluent/kafka.yaml rename stable/quotas/quota-manager/{definition => default}/apply-quotas-script.sh (68%) rename stable/quotas/quota-manager/{definition => default}/kafka.properties (100%) rename stable/quotas/quota-manager/{definition => default}/quotas.yaml (69%) diff --git a/stable/quotas/confluent/kafka.yaml b/stable/quotas/confluent/kafka.yaml new file mode 100644 index 0000000..543f29e --- /dev/null +++ b/stable/quotas/confluent/kafka.yaml @@ -0,0 +1,19 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Kafka +metadata: + name: kafka +spec: + configOverrides: + server: + - confluent.schema.registry.url=https://schemaregistry:8081 + - listener.name.internal.plain.sasl.server.callback.handler.class=io.confluent.security.auth.provider.ldap.LdapAuthenticateCallbackHandler + - listener.name.external.plain.sasl.server.callback.handler.class=io.confluent.security.auth.provider.ldap.LdapAuthenticateCallbackHandler + - listener.name.replication.plain.sasl.server.callback.handler.class=io.confluent.security.auth.provider.ldap.LdapAuthenticateCallbackHandler + - authorizer.class.name=io.confluent.kafka.security.authorizer.ConfluentServerAuthorizer + - confluent.authorizer.access.rule.providers=ZK_ACL,CONFLUENT + - quota.consumer.default = 1024 + - quota.producer.default = 1024 + - quota.window.num = 11 + - quota.window.size.seconds = 1 + + diff --git a/stable/quotas/kustomization.yaml b/stable/quotas/kustomization.yaml index e9373b7..a11f3e7 100644 --- a/stable/quotas/kustomization.yaml +++ b/stable/quotas/kustomization.yaml @@ -4,4 +4,6 @@ namespace: sandbox resources: - namespace.yaml - ../../base/cfk-components/confluent-rbac - +- quota-manager +patchesStrategicMerge: + - confluent/kafka.yaml \ No newline at end of file diff --git a/stable/quotas/quota-manager/definition/apply-quotas-script.sh b/stable/quotas/quota-manager/default/apply-quotas-script.sh similarity index 68% rename from stable/quotas/quota-manager/definition/apply-quotas-script.sh rename to stable/quotas/quota-manager/default/apply-quotas-script.sh index 65add84..e61834f 100644 --- a/stable/quotas/quota-manager/definition/apply-quotas-script.sh +++ b/stable/quotas/quota-manager/default/apply-quotas-script.sh @@ -1,7 +1,5 @@ #!/bin/bash - quota_definition="/tmp/quota-definition/quotas.yaml" - for i in $(yq '.platform.quotas | keys' < $quota_definition); do principal="${i:0}" if [[ "$principal" != "-" ]]; then @@ -20,16 +18,25 @@ for i in $(yq '.platform.quotas | keys' < $quota_definition); do fi # Removes white space and the last trailing comma config=$(echo $config_string | tr -d " \t\n\r" | rev | cut -c 2- | rev) - set -x echo $config - - kafka-configs \ - --bootstrap-server kafka:9071 \ - --alter \ - --entity-type users \ - --entity-name $principal \ - --command-config /tmp/config-properties/kafka.properties \ - --add-config "$config" + set -x + if [[ "$principal" == "global" ]]; then + kafka-configs \ + --bootstrap-server kafka:9071 \ + --alter \ + --entity-type users \ + --entity-default \ + --command-config /tmp/config-properties/kafka.properties \ + --add-config "$config" + else + kafka-configs \ + --bootstrap-server kafka:9071 \ + --alter \ + --entity-type users \ + --entity-name $principal \ + --command-config /tmp/config-properties/kafka.properties \ + --add-config "$config" + fi set +x fi done diff --git a/stable/quotas/quota-manager/definition/kafka.properties b/stable/quotas/quota-manager/default/kafka.properties similarity index 100% rename from stable/quotas/quota-manager/definition/kafka.properties rename to stable/quotas/quota-manager/default/kafka.properties diff --git a/stable/quotas/quota-manager/definition/quotas.yaml b/stable/quotas/quota-manager/default/quotas.yaml similarity index 69% rename from stable/quotas/quota-manager/definition/quotas.yaml rename to stable/quotas/quota-manager/default/quotas.yaml index ccca109..972db11 100644 --- a/stable/quotas/quota-manager/definition/quotas.yaml +++ b/stable/quotas/quota-manager/default/quotas.yaml @@ -1,10 +1,14 @@ --- platform: quotas: - app-0: + global: producer_byte_rate: 1024 consumer_byte_rate: 1024 request_percentage: 50.0 + app-0: + producer_byte_rate: 4096 + consumer_byte_rate: 2048 + request_percentage: 50.0 app-2: producer_byte_rate: 2048 consumer_byte_rate: 2048 diff --git a/stable/quotas/quota-manager/kustomization.yaml b/stable/quotas/quota-manager/kustomization.yaml index 7260bd8..31e4212 100644 --- a/stable/quotas/quota-manager/kustomization.yaml +++ b/stable/quotas/quota-manager/kustomization.yaml @@ -4,12 +4,12 @@ resources: configMapGenerator: - name: oso-quota-example files: - - ./definition/quotas.yaml + - ./default/quotas.yaml - name: config-properties files: - - ./definition/kafka.properties + - ./default/kafka.properties - name: apply-quota-script files: - - ./definition/apply-quotas-script.sh + - ./default/apply-quotas-script.sh generatorOptions: disableNameSuffixHash: true \ No newline at end of file diff --git a/stable/quotas/quota-manager/quota-manager.yaml b/stable/quotas/quota-manager/quota-manager.yaml index ac1549e..38abea9 100644 --- a/stable/quotas/quota-manager/quota-manager.yaml +++ b/stable/quotas/quota-manager/quota-manager.yaml @@ -1,29 +1,26 @@ --- -apiVersion: apps/v1 -kind: StatefulSet +apiVersion: batch/v1 +kind: Job metadata: name: quota-manager namespace: sandbox spec: - serviceName: quota-manager - podManagementPolicy: OrderedReady - replicas: 1 - selector: - matchLabels: - app: quota-manager + template: metadata: labels: app: quota-manager spec: + restartPolicy: OnFailure containers: - name: quota-manager image: quota-manager:latest imagePullPolicy: Never command: + - /tmp/quotas/apply-quotas-script.sh # - "sleep" # - "10000000" - - /tmp/quotas/apply-quotas-script.sh + resources: requests: memory: 512Mi # 768Mi From 08299dd6d53e4112b3f6d19886bee5d08f6482ed Mon Sep 17 00:00:00 2001 From: Andrew McCully Date: Tue, 24 May 2022 07:04:34 +0100 Subject: [PATCH 06/11] Hotfix as endpoints now break topic creation --- base/cfk-components/confluent-rbac/rest-class.yaml | 2 +- base/cfk-components/confluent-rbac/secrets/credential.yaml | 1 + resources/producers/4-producers-tls/source-topic.yaml | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/base/cfk-components/confluent-rbac/rest-class.yaml b/base/cfk-components/confluent-rbac/rest-class.yaml index b5aa67e..e4b27ac 100644 --- 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 - bearer: + basic: secretRef: credential diff --git a/base/cfk-components/confluent-rbac/secrets/credential.yaml b/base/cfk-components/confluent-rbac/secrets/credential.yaml index e67dc2a..81bfc12 100644 --- a/base/cfk-components/confluent-rbac/secrets/credential.yaml +++ b/base/cfk-components/confluent-rbac/secrets/credential.yaml @@ -1,6 +1,7 @@ apiVersion: v1 data: bearer.txt: dXNlcm5hbWU9a2Fma2EKcGFzc3dvcmQ9a2Fma2Etc2VjcmV0Cg== + basic.txt: dXNlcm5hbWU9a2Fma2EKcGFzc3dvcmQ9a2Fma2Etc2VjcmV0Cg== digest.txt: dXNlcm5hbWU9ImthZmthIgpwYXNzd29yZD0ia2Fma2Etc2VjcmV0Ig== plain.txt: dXNlcm5hbWU9ImthZmthIgpwYXNzd29yZD0ia2Fma2Etc2VjcmV0Ig== ldap.txt: dXNlcm5hbWU9Y249bWRzLGRjPXRlc3QsZGM9Y29tCnBhc3N3b3JkPURldmVsb3BlciEK diff --git a/resources/producers/4-producers-tls/source-topic.yaml b/resources/producers/4-producers-tls/source-topic.yaml index b454e92..de1620e 100644 --- a/resources/producers/4-producers-tls/source-topic.yaml +++ b/resources/producers/4-producers-tls/source-topic.yaml @@ -11,7 +11,6 @@ spec: type: bearer bearer: secretRef: credential - endpoint: https://kafka:8090 configs: cleanup.policy: "delete" --- @@ -27,7 +26,6 @@ spec: type: bearer bearer: secretRef: credential - endpoint: https://kafka:8090 configs: cleanup.policy: "delete" --- @@ -43,7 +41,6 @@ spec: type: bearer bearer: secretRef: credential - endpoint: https://kafka:8090 configs: cleanup.policy: "delete" --- @@ -59,6 +56,5 @@ spec: type: bearer bearer: secretRef: credential - endpoint: https://kafka:8090 configs: cleanup.policy: "delete" \ No newline at end of file From feadee80788fdec1b33fa5dabcd658ca13b69d4f Mon Sep 17 00:00:00 2001 From: Andrew McCully Date: Tue, 7 Jun 2022 10:08:36 +0100 Subject: [PATCH 07/11] fixing some issues with connect base --- base/cfk-components/confluent-rbac/connect/kafka-connect.yaml | 2 ++ .../confluent-rbac/connect/rolebindings/connect-base.yaml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/base/cfk-components/confluent-rbac/connect/kafka-connect.yaml b/base/cfk-components/confluent-rbac/connect/kafka-connect.yaml index 1733369..586f1b4 100644 --- a/base/cfk-components/confluent-rbac/connect/kafka-connect.yaml +++ b/base/cfk-components/confluent-rbac/connect/kafka-connect.yaml @@ -28,3 +28,5 @@ spec: type: bearer bearer: secretRef: credential + tls: + enabled: true diff --git a/base/cfk-components/confluent-rbac/connect/rolebindings/connect-base.yaml b/base/cfk-components/confluent-rbac/connect/rolebindings/connect-base.yaml index 52c24ce..3bf7949 100644 --- a/base/cfk-components/confluent-rbac/connect/rolebindings/connect-base.yaml +++ b/base/cfk-components/confluent-rbac/connect/rolebindings/connect-base.yaml @@ -8,7 +8,7 @@ spec: principal: name: kafka type: user - role: SecurityAdmin + role: ClusterAdmin --- apiVersion: platform.confluent.io/v1beta1 kind: ConfluentRolebinding From 5e2d76304c9d73cbd48e6e24a7817b3059b984c1 Mon Sep 17 00:00:00 2001 From: Andrew McCully Date: Wed, 8 Jun 2022 13:43:33 +0100 Subject: [PATCH 08/11] working schema-linking-example --- .../kustomization.yaml | 0 .../schema-registry.yaml | 0 .../kustomization.yaml | 0 .../schema-registry.yaml | 0 incubator/schema-registry-linking/README.md | 7 +++- .../base/confluent/control-centre.yaml | 28 --------------- .../environments/base/confluent/kafka.yaml | 27 -------------- .../base/confluent/kustomization.yaml | 9 ----- .../base/confluent/rest-class.yaml | 10 ------ .../base/confluent/schema-registry.yaml | 16 --------- .../base/confluent/zookeeper.yaml | 13 ------- .../environments/base/secrets/README.md | 2 -- .../base/secrets/ca-pair-sslcerts.yaml | 8 ----- .../base/secrets/kustomization.yaml | 7 ---- .../environments/base/secrets/mds-public.yaml | 8 ----- .../base/secrets/password-encoder.txt | 2 -- .../secrets/sealed-credential-source.yaml | 10 ------ .../cats-rest-class.yaml} | 4 +-- .../environments/cats/control-center.yaml | 12 +++++++ .../environments/cats/kafka.yaml | 19 ++++++++++ .../{source => cats}/kustomization.yaml | 13 ++++--- .../{source => cats}/namespace.yaml | 2 +- .../password-encoder-secret.yaml | 0 .../environments/cats/schema-registry.yaml | 18 ++++++++++ .../sr-linking-topic-demo.yaml | 6 ++-- .../environments/cats/zookeeper.yaml | 6 ++++ .../destination/cluster-link.yaml | 16 --------- .../clusterlink-encoder-secret.yaml | 7 ---- .../destination/control-centre.yaml | 17 --------- .../environments/destination/kafka.yaml | 19 ---------- .../destination/schema-registry.yaml | 12 ------- .../environments/dogs/control-center.yaml | 12 +++++++ .../dogs-rest-class.yaml} | 4 +-- .../environments/dogs/kafka.yaml | 19 ++++++++++ .../{destination => dogs}/kustomization.yaml | 11 +++--- .../{destination => dogs}/namespace.yaml | 2 +- .../password-encoder-secret.yaml | 0 .../environments/dogs/schema-registry.yaml | 18 ++++++++++ .../sr-linking-topic-demo.yaml | 6 ++-- .../environments/dogs/zookeeper.yaml | 6 ++++ .../environments/kustomization.yaml | 6 ++-- .../environments/master/control-center.yaml | 12 +++++++ .../environments/master/kafka.yaml | 23 ++++++++++++ .../environments/master/kustomization.yaml | 17 +++++++++ .../master/master-rest-class.yaml | 9 +++++ .../environments/master/namespace.yaml | 4 +++ .../password-encoder-secret.yaml | 0 .../schema-exporter-master-to-cats.yaml} | 8 ++--- .../schema-exporter-master-to-dogs.yaml | 16 +++++++++ .../environments/master/schema-registry.yaml | 18 ++++++++++ .../master/schemas/basic-avro.yaml | 36 +++++++++++++++++++ .../schemas}/kustomization.yaml | 4 +-- .../master/sr-linking-topic-demo.yaml | 11 ++++++ .../environments/master/zookeeper.yaml | 6 ++++ .../source/clusterlink-encoder-secret.yaml | 7 ---- .../environments/source/kafka.yaml | 24 ------------- .../environments/source/schema-registry.yaml | 12 ------- .../testing/schema-creation.sh | 5 +++ 58 files changed, 305 insertions(+), 289 deletions(-) rename base/cfk-components/confluent-no-auth-no-tls/{schmea-registry => schema-registry}/kustomization.yaml (100%) rename base/cfk-components/confluent-no-auth-no-tls/{schmea-registry => schema-registry}/schema-registry.yaml (100%) rename base/cfk-components/confluent-no-auth-tls/{schmea-registry => schema-registry}/kustomization.yaml (100%) rename base/cfk-components/confluent-no-auth-tls/{schmea-registry => schema-registry}/schema-registry.yaml (100%) delete mode 100644 incubator/schema-registry-linking/environments/base/confluent/control-centre.yaml delete mode 100644 incubator/schema-registry-linking/environments/base/confluent/kafka.yaml delete mode 100644 incubator/schema-registry-linking/environments/base/confluent/kustomization.yaml delete mode 100644 incubator/schema-registry-linking/environments/base/confluent/rest-class.yaml delete mode 100644 incubator/schema-registry-linking/environments/base/confluent/schema-registry.yaml delete mode 100644 incubator/schema-registry-linking/environments/base/confluent/zookeeper.yaml delete mode 100644 incubator/schema-registry-linking/environments/base/secrets/README.md delete mode 100644 incubator/schema-registry-linking/environments/base/secrets/ca-pair-sslcerts.yaml delete mode 100644 incubator/schema-registry-linking/environments/base/secrets/kustomization.yaml delete mode 100644 incubator/schema-registry-linking/environments/base/secrets/mds-public.yaml delete mode 100644 incubator/schema-registry-linking/environments/base/secrets/password-encoder.txt delete mode 100644 incubator/schema-registry-linking/environments/base/secrets/sealed-credential-source.yaml rename incubator/schema-registry-linking/environments/{source/source-rest-class.yaml => cats/cats-rest-class.yaml} (60%) create mode 100644 incubator/schema-registry-linking/environments/cats/control-center.yaml create mode 100644 incubator/schema-registry-linking/environments/cats/kafka.yaml rename incubator/schema-registry-linking/environments/{source => cats}/kustomization.yaml (55%) rename incubator/schema-registry-linking/environments/{source => cats}/namespace.yaml (73%) rename incubator/schema-registry-linking/environments/{base/secrets => cats}/password-encoder-secret.yaml (100%) create mode 100644 incubator/schema-registry-linking/environments/cats/schema-registry.yaml rename incubator/schema-registry-linking/environments/{source => cats}/sr-linking-topic-demo.yaml (66%) create mode 100644 incubator/schema-registry-linking/environments/cats/zookeeper.yaml delete mode 100644 incubator/schema-registry-linking/environments/destination/cluster-link.yaml delete mode 100644 incubator/schema-registry-linking/environments/destination/clusterlink-encoder-secret.yaml delete mode 100644 incubator/schema-registry-linking/environments/destination/control-centre.yaml delete mode 100644 incubator/schema-registry-linking/environments/destination/kafka.yaml delete mode 100644 incubator/schema-registry-linking/environments/destination/schema-registry.yaml create mode 100644 incubator/schema-registry-linking/environments/dogs/control-center.yaml rename incubator/schema-registry-linking/environments/{destination/cluster-link-rest-class.yaml => dogs/dogs-rest-class.yaml} (57%) create mode 100644 incubator/schema-registry-linking/environments/dogs/kafka.yaml rename incubator/schema-registry-linking/environments/{destination => dogs}/kustomization.yaml (54%) rename incubator/schema-registry-linking/environments/{destination => dogs}/namespace.yaml (67%) rename incubator/schema-registry-linking/environments/{destination => dogs}/password-encoder-secret.yaml (100%) create mode 100644 incubator/schema-registry-linking/environments/dogs/schema-registry.yaml rename incubator/schema-registry-linking/environments/{destination => dogs}/sr-linking-topic-demo.yaml (63%) create mode 100644 incubator/schema-registry-linking/environments/dogs/zookeeper.yaml create mode 100644 incubator/schema-registry-linking/environments/master/control-center.yaml create mode 100644 incubator/schema-registry-linking/environments/master/kafka.yaml create mode 100644 incubator/schema-registry-linking/environments/master/kustomization.yaml create mode 100644 incubator/schema-registry-linking/environments/master/master-rest-class.yaml create mode 100644 incubator/schema-registry-linking/environments/master/namespace.yaml rename incubator/schema-registry-linking/environments/{source => master}/password-encoder-secret.yaml (100%) rename incubator/schema-registry-linking/environments/{source/schema-exporter.yaml => master/schema-exporter-master-to-cats.yaml} (60%) create mode 100644 incubator/schema-registry-linking/environments/master/schema-exporter-master-to-dogs.yaml create mode 100644 incubator/schema-registry-linking/environments/master/schema-registry.yaml create mode 100644 incubator/schema-registry-linking/environments/master/schemas/basic-avro.yaml rename incubator/schema-registry-linking/environments/{base => master/schemas}/kustomization.yaml (73%) create mode 100644 incubator/schema-registry-linking/environments/master/sr-linking-topic-demo.yaml create mode 100644 incubator/schema-registry-linking/environments/master/zookeeper.yaml delete mode 100644 incubator/schema-registry-linking/environments/source/clusterlink-encoder-secret.yaml delete mode 100644 incubator/schema-registry-linking/environments/source/kafka.yaml delete mode 100644 incubator/schema-registry-linking/environments/source/schema-registry.yaml create mode 100644 incubator/schema-registry-linking/testing/schema-creation.sh diff --git a/base/cfk-components/confluent-no-auth-no-tls/schmea-registry/kustomization.yaml b/base/cfk-components/confluent-no-auth-no-tls/schema-registry/kustomization.yaml similarity index 100% rename from base/cfk-components/confluent-no-auth-no-tls/schmea-registry/kustomization.yaml rename to base/cfk-components/confluent-no-auth-no-tls/schema-registry/kustomization.yaml diff --git a/base/cfk-components/confluent-no-auth-no-tls/schmea-registry/schema-registry.yaml b/base/cfk-components/confluent-no-auth-no-tls/schema-registry/schema-registry.yaml similarity index 100% rename from base/cfk-components/confluent-no-auth-no-tls/schmea-registry/schema-registry.yaml rename to base/cfk-components/confluent-no-auth-no-tls/schema-registry/schema-registry.yaml diff --git a/base/cfk-components/confluent-no-auth-tls/schmea-registry/kustomization.yaml b/base/cfk-components/confluent-no-auth-tls/schema-registry/kustomization.yaml similarity index 100% rename from base/cfk-components/confluent-no-auth-tls/schmea-registry/kustomization.yaml rename to base/cfk-components/confluent-no-auth-tls/schema-registry/kustomization.yaml diff --git a/base/cfk-components/confluent-no-auth-tls/schmea-registry/schema-registry.yaml b/base/cfk-components/confluent-no-auth-tls/schema-registry/schema-registry.yaml similarity index 100% rename from base/cfk-components/confluent-no-auth-tls/schmea-registry/schema-registry.yaml rename to base/cfk-components/confluent-no-auth-tls/schema-registry/schema-registry.yaml diff --git a/incubator/schema-registry-linking/README.md b/incubator/schema-registry-linking/README.md index d05b61f..02bd4ce 100644 --- a/incubator/schema-registry-linking/README.md +++ b/incubator/schema-registry-linking/README.md @@ -37,7 +37,12 @@ Minikube:source:schemaregistry:9081 -> localhost:9082 ```shell -kubectl port-forward kafka-0 9071:9071 --namespace source +nohup kubectl port-forward schemaregistry-0 8081:8081 --namespace master \ +&& \ +nohup kubectl port-forward schemaregistry-0 8082:8081 --namespace dogs \ +&& \ +nohup kubectl port-forward schemaregistry-0 8083:8081 --namespace cats + ``` kubectl port-forward \ $(kubectl get pods -n source -l statefulset.kubernetes.io/pod-name:kafka-0 -o name) \ diff --git a/incubator/schema-registry-linking/environments/base/confluent/control-centre.yaml b/incubator/schema-registry-linking/environments/base/confluent/control-centre.yaml deleted file mode 100644 index 7bd8a58..0000000 --- a/incubator/schema-registry-linking/environments/base/confluent/control-centre.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -apiVersion: platform.confluent.io/v1beta1 -kind: ControlCenter -metadata: - name: controlcenter -spec: - replicas: 1 - podTemplate: - probe: - liveness: - periodSeconds: 10 - failureThreshold: 5 - timeoutSeconds: 500 - image: - application: confluentinc/cp-enterprise-control-center:7.1.0 - init: confluentinc/confluent-init-container:2.2.0 - dataVolumeCapacity: 10Gi - tls: - autoGeneratedCerts: true - dependencies: - kafka: - bootstrapEndpoint: kafka:9071 - tls: - enabled: true - schemaRegistry: - url: https://schemaregistry:8081 - tls: - enabled: true diff --git a/incubator/schema-registry-linking/environments/base/confluent/kafka.yaml b/incubator/schema-registry-linking/environments/base/confluent/kafka.yaml deleted file mode 100644 index c80cfd4..0000000 --- a/incubator/schema-registry-linking/environments/base/confluent/kafka.yaml +++ /dev/null @@ -1,27 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: Kafka -metadata: - name: kafka -spec: - replicas: 3 - image: - application: confluentinc/cp-server:7.1.0 - init: confluentinc/confluent-init-container:2.2.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 diff --git a/incubator/schema-registry-linking/environments/base/confluent/kustomization.yaml b/incubator/schema-registry-linking/environments/base/confluent/kustomization.yaml deleted file mode 100644 index 8f77ba6..0000000 --- a/incubator/schema-registry-linking/environments/base/confluent/kustomization.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - zookeeper.yaml - - kafka.yaml - - control-centre.yaml -# - rest-class.yaml - - schema-registry.yaml - diff --git a/incubator/schema-registry-linking/environments/base/confluent/rest-class.yaml b/incubator/schema-registry-linking/environments/base/confluent/rest-class.yaml deleted file mode 100644 index 6b27d1f..0000000 --- a/incubator/schema-registry-linking/environments/base/confluent/rest-class.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: KafkaRestClass -metadata: - name: default -spec: - kafkaRest: - authentication: - type: bearer - bearer: - secretRef: sealed-credential diff --git a/incubator/schema-registry-linking/environments/base/confluent/schema-registry.yaml b/incubator/schema-registry-linking/environments/base/confluent/schema-registry.yaml deleted file mode 100644 index f86b9cc..0000000 --- a/incubator/schema-registry-linking/environments/base/confluent/schema-registry.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: SchemaRegistry -metadata: - name: schemaregistry -spec: - replicas: 1 - image: - application: confluentinc/cp-schema-registry:7.1.0 - init: confluentinc/confluent-init-container:2.2.0 - tls: - autoGeneratedCerts: true - dependencies: - kafka: - bootstrapEndpoint: kafka:9071 - tls: - enabled: true diff --git a/incubator/schema-registry-linking/environments/base/confluent/zookeeper.yaml b/incubator/schema-registry-linking/environments/base/confluent/zookeeper.yaml deleted file mode 100644 index 004a663..0000000 --- a/incubator/schema-registry-linking/environments/base/confluent/zookeeper.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: Zookeeper -metadata: - name: zookeeper -spec: - replicas: 3 - image: - application: confluentinc/cp-zookeeper:7.1.0 - init: confluentinc/confluent-init-container:2.2.0 - dataVolumeCapacity: 10Gi - logVolumeCapacity: 10Gi - tls: - autoGeneratedCerts: true \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/base/secrets/README.md b/incubator/schema-registry-linking/environments/base/secrets/README.md deleted file mode 100644 index 4d9b4b5..0000000 --- a/incubator/schema-registry-linking/environments/base/secrets/README.md +++ /dev/null @@ -1,2 +0,0 @@ -kubectl create secret generic password-encoder-secret \ - --from-file=password-encoder.txt=./password-encoder.txt -o yaml > password-encoder-secret.yaml \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/base/secrets/ca-pair-sslcerts.yaml b/incubator/schema-registry-linking/environments/base/secrets/ca-pair-sslcerts.yaml deleted file mode 100644 index 491e1f6..0000000 --- a/incubator/schema-registry-linking/environments/base/secrets/ca-pair-sslcerts.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -data: - tls.crt: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURtRENDQW9DZ0F3SUJBZ0lVSEZEYWdiZ0Y4bTg0NzhoUEJpTktGOGI5MHVzd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1pERVJNQThHQTFVRUJoTUlWVzVwZG1WeWMyVXhEekFOQmdOVkJBZ1RCbEJoYm1kbFlURU9NQXdHQTFVRQpCeE1GUldGeWRHZ3hEVEFMQmdOVkJBb1RCRUZqYldVeERqQU1CZ05WQkFzVEJVMTVUM0puTVE4d0RRWURWUVFECkV3WlVaWE4wUTBFd0hoY05NakV3T0RFMk1USXhPREF3V2hjTk1qWXdPREUxTVRJeE9EQXdXakJrTVJFd0R3WUQKVlFRR0V3aFZibWwyWlhKelpURVBNQTBHQTFVRUNCTUdVR0Z1WjJWaE1RNHdEQVlEVlFRSEV3VkZZWEowYURFTgpNQXNHQTFVRUNoTUVRV050WlRFT01Bd0dBMVVFQ3hNRlRYbFBjbWN4RHpBTkJnTlZCQU1UQmxSbGMzUkRRVENDCkFTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSzZ6NzJNbithSElYZ1RkODVqdi8rMm4KT0daQU9ITWhOQ2J2V1Y1cWVlTlgwaXZIZVhtRkF4TmFSc2ZKbGhOUllpTVRLRTRoUjZreTdEUWxFbVZLQ1g0cwpnaExYZ28wU3pUV3BhNkltcmFIbnplQWhob1gyaWxFdjRvUVVxMVFDdHhRd0NhVmxLYXhCM1pLNExzVVFuZlRqClBFL3JtQURwd2UxSjlteWxLeDJuNEl1V2NNRjE5dlBFdjc4dTdXU0FDNUQzdXVjTUwwRzByZys3K0srTXRQV1EKSk9UcWp2MHR6RGt4UXg0NmVlL042eFI0czdKbVRHc29SeC9KRDVOVUozNTJYYTFrNHhSUVltRnJ0U0V4UTBPUgpWSVNhYnQ2ZzA5L1NqQ0JrQTRWb0NoazBXL0o0K0k1VGR0clh0ZUpaTVBrWlhKMkxvS3hXM0NCVW0vRG9xUXNDCkF3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0VHTUE4R0ExVWRFd0VCL3dRRk1BTUJBZjh3SFFZRFZSME8KQkJZRUZOSFRzcEFlcURDVFUwMDB5SGU0ZzlEMURrcXNNQTBHQ1NxR1NJYjNEUUVCQ3dVQUE0SUJBUUF3VFErOApzTExxbURpV2RSeTZrOThyWWpPR3RXVW10ZWVSNDhNRWxQR3RSZ3BLWFhjcTBaSnd5ZHd3VTVZKzhuL3lyYW5UCmQzUWxEOWR5MDlZNHhYbDFkR2FhbWw0ZXE4cFZWQm04WE9kVkNaWnR3WjNHQ0I1NFdrQ2RHdnFIS3hnclVzb1IKMC9UYU15TVNXbmZMdk9XNHhLOXpQanAxYUc1eDdGeFJybW5OVjRUTHE5UFpOa3krK3Y2Y2dyNTF4OXdPOVNHaQpGTHBJOE9yTkdVeWxuZGhVMGFYSzRnZUFwZXh2cEJDNjdqY1Y4Nmo4emxKNkJaMnRRQXA0ZDFBeGVVQjROdmVsCmg3TFRCS0toemRER2lWUTFWYStoR1pGaE1GeXUxTzUrbVhzaUFwOTc1UEZ2S1pLMWJaeC90WjdMZjRSdXZpUjgKRHBQRUpMT2c1TXpQb2FFLwotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg== - tls.key: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBcnJQdll5ZjVvY2hlQk4zem1PLy83YWM0WmtBNGN5RTBKdTlaWG1wNTQxZlNLOGQ1CmVZVURFMXBHeDhtV0UxRmlJeE1vVGlGSHFUTHNOQ1VTWlVvSmZpeUNFdGVDalJMTk5hbHJvaWF0b2VmTjRDR0cKaGZhS1VTL2loQlNyVkFLM0ZEQUpwV1VwckVIZGtyZ3V4UkNkOU9NOFQrdVlBT25CN1VuMmJLVXJIYWZnaTVadwp3WFgyODhTL3Z5N3RaSUFMa1BlNjV3d3ZRYlN1RDd2NHI0eTA5WkFrNU9xTy9TM01PVEZESGpwNTc4M3JGSGl6CnNtWk1heWhISDhrUGsxUW5mblpkcldUakZGQmlZV3UxSVRGRFE1RlVoSnB1M3FEVDM5S01JR1FEaFdnS0dUUmIKOG5qNGpsTjIydGUxNGxrdytSbGNuWXVnckZiY0lGU2I4T2lwQ3dJREFRQUJBb0lCQUg1T2pTYXRRaWdiaXc0Tgp3ZzZ5aGVBMlkrcFpSL2JFN01XeGluVmVtZDBxSTBPUHBsMmJNd3dNMnR1YS9TdmVUUXQ2MEVzY2VJajF6aHd0CktVMmQ1NXNYWnJ0a29IaUtQVjhzckNyQnVBczBZbjVHL3RGZjI4U3kwQndhTFh4QnNrZWdLM2t1MktBM3hwQkwKSlZWSW5FcnU5eTM0OFI3SDRuTkNaQzFNaFEyY25SeFluc0Y0c2JxYWtvVHhMa08waTh3OXIwSXIwKzZIK0tJLwpjeUFWaWJuUi80L2VxODh0UDRhT0RrazZ0cUsweTk2S2ZqTEdpbGdsWW9CemUyK1AvNHhrSHlJYXZHd3ZCdllNCkgrc042OGhNbnhXbzg0cVp1RENROWJkOTA3MFV2d1NOc2ZNNkRBL3NBYWVTb0VSeHE4Z0xpSlhXZVZXQ3JNKzEKMFdrQTZJRUNnWUVBNXR4dStTZk0ra2NtM1hoMitKUWlIeERVNC9oankvYlBpV2k2d3ZjR2tFVksvRGQxZHlWQwprYUVjT05oblBFNytCZ21YbWVQdno3dG9nTmtrK2FncGY4L1JQVmFvNUQxemZSNkZESGU5QnBWWjRxUDdzYzk4CjFHRC9vVzFDaWVvUmVyQVlMM1BVWktIZ0g1a0ltR21ZR3owSUVxa0ZzeHl5bG4vVkc1T2ZoT0VDZ1lFQXdib0QKOUJKWGwxK3dUVHdPRE9KclFzZlFUc0lxR1pzZUtMYlM3cGwvT29mUWxCd0ZYN0VrV0RFejE4ZjV1MUEvUnhaSApCeUNTY2tiZW5GbXhFR0Zpa2Foc05EaGhzRWw3blpveDlDcWJFWXJwY08rUWRTTmlSSDBralpLdTladnd6VERxCmhMclV4b2Irbm5WdFFqenZCNmYrZThCc052UkJIY1hxUkhQZy8yc0NnWUFmaHY4SXU2eThpVGIvaTlJRGhJZGMKWXJvUUgvM1Evdlc4dURhNUpXOGFDTHlDMFRnVGUxMHA4aXllZnI4cWQwY3RuK1c2T0d5cG05aGJzRXZpWkZxMgpmN1Q5Z1hZekpVaytUd3F3ZHpHelVuWWlBMjcrQzIzcXV3eHVDVFBMRGRJeFJSY29jOU1Qb3lPdWJRSEZmcll0CkVocW1JYnNMaU9IQ3Q5WnNtNjV2UVFLQmdEa0tyWmxUUVVsSUdxQlRPNHZkcTFtSmZqT0NobVR0d0s2YVRuZUUKNk9weURSOWZOTkhkVmVkRjdZN3V5Z0MyZXp0U091M0ZVSG1ubG1xUkdrckpjZjJUaXZEQlhUcE1HTUxxSVNWVQoyajRMR2Z0di9xZ1BHQ00wZWV2WnNmeU53eFNYLzZXL1lXRm5aRmVDR2Y2ejlHbmJ0Rm41NmFNd3ZtK20wL2o5CjZkVXJBb0dCQUt2a0UrcnQ4MldRbjQydTNaei9aa3RMNHhLM3FKU3lDR0kycnpPQUtDTm92M1FPWlpiVVdqTDAKaTBYeVA5dFRDMnJYRDhZelVUblYzbUM5YjlGUkI5UFZ4OHY0OTllQjJaYTNiY29CRERpVU9VT0NsTlc5VElqWgpFNnFCSm5aY21QTllqZXl3UFE3aFFhbU1NUnA1MWlOeUVZYTVGOXFuU3hhcUN1cjRsaUN6Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg== -kind: Secret -metadata: - name: ca-pair-sslcerts -type: kubernetes.io/tls diff --git a/incubator/schema-registry-linking/environments/base/secrets/kustomization.yaml b/incubator/schema-registry-linking/environments/base/secrets/kustomization.yaml deleted file mode 100644 index 1becf02..0000000 --- a/incubator/schema-registry-linking/environments/base/secrets/kustomization.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: - - ca-pair-sslcerts.yaml - - sealed-credential-source.yaml - - password-encoder-secret.yaml - - mds-public.yaml diff --git a/incubator/schema-registry-linking/environments/base/secrets/mds-public.yaml b/incubator/schema-registry-linking/environments/base/secrets/mds-public.yaml deleted file mode 100644 index a74258c..0000000 --- a/incubator/schema-registry-linking/environments/base/secrets/mds-public.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -data: - mdsTokenKeyPair.pem: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBd015am5QNHFmZFRLaENTNXNQYlZxaVhWeVExNXdyZVZBc0VxRXNuTUZ0Mkp0TUwxCjNFTE9RMnN6V241N1d6dTc4MmJ5RXRZRmxGM1RvVlczY2w0ZE9KUnphU0VRNnhlMTBSL2k3VG5lSXRFUWZwSnIKLzJMNGJ1YnVRUkdOZS9LckxNRTBpdnI5dTRJRWJiUlMrbHR1NkE5Z2d6R2NhRFN4Vi9leUtNTlBhZEhRL0FONApCWmlqQWVLWmNEVGp6NmJIako2RVEzWU5ncXluODQ2cmVRazlUb0habDhiR0hPaHo1Qzd5b0lmc3haZ1lIbG54CjZKR3NpVVo1UDM2V0djMzhaSUIvbTQ1bzhjdjRpZlVWUFVCMElRUTlBaFlJNVp1TXJ4RHNSUERYMkdHNkU1YlcKMnZxRFd5cVhPWTdjU29JN0Fpa0Zkd0FUVzRSdjdldUVKVXl6TndJREFRQUJBb0lCQVFDS3pJaFpoSTE0cTFIawprai93eTdNRTNGb3RkUHNjbUdlNVpQRHlONzhyRXZDSlp2WHpUVkVMTGtqNU5DZUFoZCtJbXF0WnJpUzBMRndvClFQcGhacW5veXM3UGQ1T2pmQjFUNFgzUVJTSEx0UEVIL2tlcncwZVJKOFdNcUtOUUFXTUVSRStjWXBkNmYxN0sKejlBUkZ2UWdNcm5MbVZLOW5ubXlGOHQyRnkyN3dxVVZCbVlYWC9tK25lLysyUzRQTzhac1BkM3dZMlk5UjhMVgp1ZmJIQytIMkV4QThuRTR6dGVmZzl6UHluMXdNaS9HTVVnMVdpQ1QzQjJ1M0Nac1dhWkp6Vkl0VDZ0N3FuQVpKClh6a2dOcElIbjltV3V3aDhreGdNZDZzeERSQU9ENWlQZDZhOWkwb0xTYVMzLzBMRGV6VUxDMFZoVFB5M0cyb1IKQTBBSmVPblJBb0dCQVBWMXV6MXBQSkF0ZW1yOHdMaUtoUU9lOGpBc3h0blN6VjhGcWQxMXFKWWduaWh3YWkrWQprNDRoT0ovMDIvNnd5cTQ5RmhNR21reUZXdjVkVURFUkdWN01jWFA2YkVmWTVjMVArUGRSVUFtNUg1bmVmMzd6Ck5SOWY3b2lmVjNqKzQ5dXkyVmZVUUNyL2grVCt5d3pBb2MwaVp5WUdhSTF3aktYUXIzKzFvNTV2QW9HQkFNa1UKQnEySWFJRHdvbUJnUUNLUWpDeS9BTmpRMzJ5TUFHSGYvbUUzMlJURnB1NVNaRUxlOXlyR1FyM3hIRnRROWFRTApWdjVQMDl3WmZiNElPZHAvM3d3SE1xRmpOak5kRzhzdzdSeU5TK3dmUUd1OHYxR2ZZc3N1QnVYaTl2MFhHWEZICldlbk5RRVVQYmliUmJvY0o5Mk9KVEpLNFAvczV2djEzMkhEUi9wdTVBb0dCQUorWThTbTQ1endIbGZWQ2FqeVQKTkhGcVE2YTNOb1FpNEkzTUxPcGx1andDOFZMeDVOa1ZwN3RlTm1jcTJtLzdtNDAzQXNkVUg3ZHBiZ1M5djRwbgp4OHN2dXdUaDZzMjhaWTdkVk0vWit1U1hqY2lLTnZQZ1JzWWpwZ0VIT2VUZU5tRi9KSHBLODM0QnIrWmhGTDB4Cjh3SmlRQmNsUzQzTGhHZThES0JKQmgzWkFvR0FONWJIdWRYS1BrdElPS2lqVW1ydnRiY2dQdENQMCt4b2RxWjgKSnRoUHRVUm5QOStiUkRscnozRjhKaEt3S2phWmtqNW9VR28xUWRYeVEwVDI2WWNNWE1Eb3FHRkxMS3dDOFF1WApvWnNXY0RLN2xvMVp2dkQzV1FCaWU4OWhSTnJMOTlzbjZsRUtBWTJnZ0M3S0JaOGx1MmpMdUl3amRBcWsyR0gzCmZra3Z3RkVDZ1lBeVhqNXo2Q09QSURKMUUxVkxySml3MVlCWGFhN1pMazVFcHczUXZDTTdoVEtTRmJ1U053c3AKRXVMbU03Zzh3TVBaQWJ6cy9SUU9hZjlJaEUveDUzZE8ySW1rNVBBUmFvRXNTRmpORDRkcFZIYUtlbTJjQm9tdAp4NXEwU3FVVnE2eHY0MjIxM2dsQlFNREo0cVFYVHJzRUJkcE55bnY3b1ZlWFh3Y2FPVFVhQnc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQ== - mdsPublicKey.pem: LS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF3TXlqblA0cWZkVEtoQ1M1c1BiVgpxaVhWeVExNXdyZVZBc0VxRXNuTUZ0Mkp0TUwxM0VMT1Eyc3pXbjU3V3p1NzgyYnlFdFlGbEYzVG9WVzNjbDRkCk9KUnphU0VRNnhlMTBSL2k3VG5lSXRFUWZwSnIvMkw0YnVidVFSR05lL0tyTE1FMGl2cjl1NElFYmJSUytsdHUKNkE5Z2d6R2NhRFN4Vi9leUtNTlBhZEhRL0FONEJaaWpBZUtaY0RUano2YkhqSjZFUTNZTmdxeW44NDZyZVFrOQpUb0habDhiR0hPaHo1Qzd5b0lmc3haZ1lIbG54NkpHc2lVWjVQMzZXR2MzOFpJQi9tNDVvOGN2NGlmVVZQVUIwCklRUTlBaFlJNVp1TXJ4RHNSUERYMkdHNkU1YlcydnFEV3lxWE9ZN2NTb0k3QWlrRmR3QVRXNFJ2N2V1RUpVeXoKTndJREFRQUIKLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0t -kind: Secret -metadata: - creationTimestamp: null - name: mds-public diff --git a/incubator/schema-registry-linking/environments/base/secrets/password-encoder.txt b/incubator/schema-registry-linking/environments/base/secrets/password-encoder.txt deleted file mode 100644 index f7b91e4..0000000 --- a/incubator/schema-registry-linking/environments/base/secrets/password-encoder.txt +++ /dev/null @@ -1,2 +0,0 @@ -password=secretfoobar -oldPassword=foobar2 \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/base/secrets/sealed-credential-source.yaml b/incubator/schema-registry-linking/environments/base/secrets/sealed-credential-source.yaml deleted file mode 100644 index beb7a76..0000000 --- a/incubator/schema-registry-linking/environments/base/secrets/sealed-credential-source.yaml +++ /dev/null @@ -1,10 +0,0 @@ -apiVersion: v1 -data: - bearer.txt: dXNlcm5hbWU9a2Fma2EKcGFzc3dvcmQ9a2Fma2Etc2VjcmV0Cg== - basic.txt: dXNlcm5hbWU9a2Fma2EKcGFzc3dvcmQ9a2Fma2Etc2VjcmV0Cg== - ldap.txt: dXNlcm5hbWU9Y249bWRzLGRjPXRlc3QsZGM9Y29tCnBhc3N3b3JkPURldmVsb3BlciEK - plain-jaas.conf: c2FzbC5qYWFzLmNvbmZpZz1vcmcuYXBhY2hlLmthZmthLmNvbW1vbi5zZWN1cml0eS5wbGFpbi5QbGFpbkxvZ2luTW9kdWxlIHJlcXVpcmVkIHVzZXJuYW1lPSJrYWZrYSIgcGFzc3dvcmQ9ImthZmthLXNlY3JldCI7 -kind: Secret -metadata: - creationTimestamp: null - name: sealed-credential diff --git a/incubator/schema-registry-linking/environments/source/source-rest-class.yaml b/incubator/schema-registry-linking/environments/cats/cats-rest-class.yaml similarity index 60% rename from incubator/schema-registry-linking/environments/source/source-rest-class.yaml rename to incubator/schema-registry-linking/environments/cats/cats-rest-class.yaml index e90afde..c9f8990 100644 --- a/incubator/schema-registry-linking/environments/source/source-rest-class.yaml +++ b/incubator/schema-registry-linking/environments/cats/cats-rest-class.yaml @@ -1,9 +1,9 @@ apiVersion: platform.confluent.io/v1beta1 kind: KafkaRestClass metadata: - name: source-kafka-rest + name: cats-kafka-rest spec: kafkaClusterRef: name: kafka kafkaRest: - endpoint: http://kafka.source.svc.cluster.local:8090 + endpoint: http://kafka.cats.svc.cluster.local:8090 diff --git a/incubator/schema-registry-linking/environments/cats/control-center.yaml b/incubator/schema-registry-linking/environments/cats/control-center.yaml new file mode 100644 index 0000000..73907f7 --- /dev/null +++ b/incubator/schema-registry-linking/environments/cats/control-center.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: platform.confluent.io/v1beta1 +kind: ControlCenter +metadata: + name: controlcenter +spec: + configOverrides: + server: + - confluent.controlcenter.internal.topics.replication=1 + - confluent.controlcenter.command.topic.replication=1 + - confluent.monitoring.interceptor.topic.replication=1 + - confluent.metrics.topic.replication=1 \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/cats/kafka.yaml b/incubator/schema-registry-linking/environments/cats/kafka.yaml new file mode 100644 index 0000000..ff7edf7 --- /dev/null +++ b/incubator/schema-registry-linking/environments/cats/kafka.yaml @@ -0,0 +1,19 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Kafka +metadata: + name: kafka +spec: + replicas: 1 + configOverrides: + server: + - confluent.schema.registry.url=http://schemaregistry:8081 + - confluent.balancer.topic.replication.factor=1 + - confluent.license.topic.replication.factor=1 + - confluent.tier.metadata.replication.factor=1 + - confluent.metadata.topic.replication.factor=1 + - confluent.metrics.reporter.topic.replicas=1 + - confluent.balancer.topic.replication.factor=1 + - confluent.security.event.logger.exporter.kafka.topic.replicas=1 + - default.replication.factor=1 + - event.logger.exporter.kafka.topic.replicas=1 + - offsets.topic.replication.factor=1 diff --git a/incubator/schema-registry-linking/environments/source/kustomization.yaml b/incubator/schema-registry-linking/environments/cats/kustomization.yaml similarity index 55% rename from incubator/schema-registry-linking/environments/source/kustomization.yaml rename to incubator/schema-registry-linking/environments/cats/kustomization.yaml index c0711bc..d1abd26 100644 --- a/incubator/schema-registry-linking/environments/source/kustomization.yaml +++ b/incubator/schema-registry-linking/environments/cats/kustomization.yaml @@ -1,15 +1,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: source +namespace: cats resources: - - ../../../../base/cfk-components/confluent-no-auth-no-tls - - ../../../../base/cfk-components/confluent-no-auth-no-tls/schmea-registry - namespace.yaml - - schema-exporter.yaml + - ../../../../base/cfk-components/confluent-no-auth-no-tls - sr-linking-topic-demo.yaml - - source-rest-class.yaml - password-encoder-secret.yaml - - clusterlink-encoder-secret.yaml + - schema-registry.yaml + - cats-rest-class.yaml patchesStrategicMerge: - kafka.yaml - - schema-registry.yaml \ No newline at end of file + - zookeeper.yaml + - control-center.yaml \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/source/namespace.yaml b/incubator/schema-registry-linking/environments/cats/namespace.yaml similarity index 73% rename from incubator/schema-registry-linking/environments/source/namespace.yaml rename to incubator/schema-registry-linking/environments/cats/namespace.yaml index 6163026..95bddf9 100644 --- a/incubator/schema-registry-linking/environments/source/namespace.yaml +++ b/incubator/schema-registry-linking/environments/cats/namespace.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: source + name: cats diff --git a/incubator/schema-registry-linking/environments/base/secrets/password-encoder-secret.yaml b/incubator/schema-registry-linking/environments/cats/password-encoder-secret.yaml similarity index 100% rename from incubator/schema-registry-linking/environments/base/secrets/password-encoder-secret.yaml rename to incubator/schema-registry-linking/environments/cats/password-encoder-secret.yaml diff --git a/incubator/schema-registry-linking/environments/cats/schema-registry.yaml b/incubator/schema-registry-linking/environments/cats/schema-registry.yaml new file mode 100644 index 0000000..8c2c0de --- /dev/null +++ b/incubator/schema-registry-linking/environments/cats/schema-registry.yaml @@ -0,0 +1,18 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: SchemaRegistry +metadata: + name: schemaregistry +spec: + replicas: 1 + image: + application: confluentinc/cp-schema-registry:7.1.0 + init: confluentinc/confluent-init-container:2.3.0 + passwordEncoder: + secretRef: password-encoder-secret + enableSchemaExporter: true + configOverrides: + server: + - kafkastore.topic.replication.factor=1 +# - leader.eligibility=false +# - schema.registry.group.id=id_schemaregistry_master +# - kafkastore.topic=_schemas diff --git a/incubator/schema-registry-linking/environments/source/sr-linking-topic-demo.yaml b/incubator/schema-registry-linking/environments/cats/sr-linking-topic-demo.yaml similarity index 66% rename from incubator/schema-registry-linking/environments/source/sr-linking-topic-demo.yaml rename to incubator/schema-registry-linking/environments/cats/sr-linking-topic-demo.yaml index d2ee303..be3f505 100644 --- a/incubator/schema-registry-linking/environments/source/sr-linking-topic-demo.yaml +++ b/incubator/schema-registry-linking/environments/cats/sr-linking-topic-demo.yaml @@ -1,11 +1,11 @@ apiVersion: platform.confluent.io/v1beta1 kind: KafkaTopic metadata: - name: sr-linking-topic-demo-sources + name: sr-linking-topic-demo-cats spec: - replicas: 3 + replicas: 1 partitionCount: 4 configs: cleanup.policy: "delete" kafkaRestClassRef: - name: source-kafka-rest \ No newline at end of file + name: cats-kafka-rest \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/cats/zookeeper.yaml b/incubator/schema-registry-linking/environments/cats/zookeeper.yaml new file mode 100644 index 0000000..8c12602 --- /dev/null +++ b/incubator/schema-registry-linking/environments/cats/zookeeper.yaml @@ -0,0 +1,6 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Zookeeper +metadata: + name: zookeeper +spec: + replicas: 1 \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/destination/cluster-link.yaml b/incubator/schema-registry-linking/environments/destination/cluster-link.yaml deleted file mode 100644 index 88fde7f..0000000 --- a/incubator/schema-registry-linking/environments/destination/cluster-link.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: ClusterLink -metadata: - name: clusterlink-demo -spec: - destinationKafkaCluster: - kafkaRestClassRef: - name: destination-kafka-rest - namespace: destination - sourceKafkaCluster: - bootstrapEndpoint: kafka.source.svc.cluster.local:9071 - kafkaRestClassRef: - name: source-kafka-rest - namespace: source - mirrorTopics: - - name: sr-linking-topic-demo-sources diff --git a/incubator/schema-registry-linking/environments/destination/clusterlink-encoder-secret.yaml b/incubator/schema-registry-linking/environments/destination/clusterlink-encoder-secret.yaml deleted file mode 100644 index af6c51e..0000000 --- a/incubator/schema-registry-linking/environments/destination/clusterlink-encoder-secret.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -data: - clusterlink_encoder_secret: c2VjcmV0PXNlY3JldA== -kind: Secret -metadata: - name: clusterlink-encoder-secret -type: Opaque diff --git a/incubator/schema-registry-linking/environments/destination/control-centre.yaml b/incubator/schema-registry-linking/environments/destination/control-centre.yaml deleted file mode 100644 index d1485aa..0000000 --- a/incubator/schema-registry-linking/environments/destination/control-centre.yaml +++ /dev/null @@ -1,17 +0,0 @@ ---- -apiVersion: platform.confluent.io/v1beta1 -kind: ControlCenter -metadata: - name: controlcenter -spec: - externalAccess: - type: loadBalancer - loadBalancer: - domain: oso-c3 - port: 9021 - dependencies: - connect: null - ksqldb: null - schemaRegistry: - url: http://schemaregistry:8081 - diff --git a/incubator/schema-registry-linking/environments/destination/kafka.yaml b/incubator/schema-registry-linking/environments/destination/kafka.yaml deleted file mode 100644 index d0ea70c..0000000 --- a/incubator/schema-registry-linking/environments/destination/kafka.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: Kafka -metadata: - name: kafka -spec: - mountedSecrets: - - secretRef: clusterlink-encoder-secret - configOverrides: - server: - - confluent.cluster.link.enable=true - - password.encoder.secret=${file:/mnt/secrets/clusterlink-encoder-secret/clusterlink_encoder_secret:secret} - listeners: - external: - externalAccess: - type: loadBalancer - loadBalancer: - brokerPrefix: destination - bootstrapPrefix: destination - domain: oso-destination \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/destination/schema-registry.yaml b/incubator/schema-registry-linking/environments/destination/schema-registry.yaml deleted file mode 100644 index 21a516b..0000000 --- a/incubator/schema-registry-linking/environments/destination/schema-registry.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: SchemaRegistry -metadata: - name: schemaregistry -spec: - passwordEncoder: - secretRef: password-encoder-secret - enableSchemaExporter: true - externalAccess: - type: loadBalancer - loadBalancer: - domain: oso-destination \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/dogs/control-center.yaml b/incubator/schema-registry-linking/environments/dogs/control-center.yaml new file mode 100644 index 0000000..73907f7 --- /dev/null +++ b/incubator/schema-registry-linking/environments/dogs/control-center.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: platform.confluent.io/v1beta1 +kind: ControlCenter +metadata: + name: controlcenter +spec: + configOverrides: + server: + - confluent.controlcenter.internal.topics.replication=1 + - confluent.controlcenter.command.topic.replication=1 + - confluent.monitoring.interceptor.topic.replication=1 + - confluent.metrics.topic.replication=1 \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/destination/cluster-link-rest-class.yaml b/incubator/schema-registry-linking/environments/dogs/dogs-rest-class.yaml similarity index 57% rename from incubator/schema-registry-linking/environments/destination/cluster-link-rest-class.yaml rename to incubator/schema-registry-linking/environments/dogs/dogs-rest-class.yaml index 7b27222..d385ce4 100644 --- a/incubator/schema-registry-linking/environments/destination/cluster-link-rest-class.yaml +++ b/incubator/schema-registry-linking/environments/dogs/dogs-rest-class.yaml @@ -1,9 +1,9 @@ apiVersion: platform.confluent.io/v1beta1 kind: KafkaRestClass metadata: - name: destination-kafka-rest + name: dogs-kafka-rest spec: kafkaClusterRef: name: kafka kafkaRest: - endpoint: http://kafka.destination.svc.cluster.local:8090 \ No newline at end of file + endpoint: http://kafka.dogs.svc.cluster.local:8090 diff --git a/incubator/schema-registry-linking/environments/dogs/kafka.yaml b/incubator/schema-registry-linking/environments/dogs/kafka.yaml new file mode 100644 index 0000000..ff7edf7 --- /dev/null +++ b/incubator/schema-registry-linking/environments/dogs/kafka.yaml @@ -0,0 +1,19 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Kafka +metadata: + name: kafka +spec: + replicas: 1 + configOverrides: + server: + - confluent.schema.registry.url=http://schemaregistry:8081 + - confluent.balancer.topic.replication.factor=1 + - confluent.license.topic.replication.factor=1 + - confluent.tier.metadata.replication.factor=1 + - confluent.metadata.topic.replication.factor=1 + - confluent.metrics.reporter.topic.replicas=1 + - confluent.balancer.topic.replication.factor=1 + - confluent.security.event.logger.exporter.kafka.topic.replicas=1 + - default.replication.factor=1 + - event.logger.exporter.kafka.topic.replicas=1 + - offsets.topic.replication.factor=1 diff --git a/incubator/schema-registry-linking/environments/destination/kustomization.yaml b/incubator/schema-registry-linking/environments/dogs/kustomization.yaml similarity index 54% rename from incubator/schema-registry-linking/environments/destination/kustomization.yaml rename to incubator/schema-registry-linking/environments/dogs/kustomization.yaml index e86f44f..ec16b0a 100644 --- a/incubator/schema-registry-linking/environments/destination/kustomization.yaml +++ b/incubator/schema-registry-linking/environments/dogs/kustomization.yaml @@ -1,15 +1,14 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization -namespace: destination +namespace: dogs resources: - namespace.yaml - ../../../../base/cfk-components/confluent-no-auth-no-tls - - ../../../../base/cfk-components/confluent-no-auth-no-tls/schmea-registry - - cluster-link-rest-class.yaml - sr-linking-topic-demo.yaml - - cluster-link.yaml - - clusterlink-encoder-secret.yaml - password-encoder-secret.yaml + - schema-registry.yaml + - dogs-rest-class.yaml patchesStrategicMerge: - kafka.yaml -# - control-centre.yaml \ No newline at end of file + - zookeeper.yaml + - control-center.yaml diff --git a/incubator/schema-registry-linking/environments/destination/namespace.yaml b/incubator/schema-registry-linking/environments/dogs/namespace.yaml similarity index 67% rename from incubator/schema-registry-linking/environments/destination/namespace.yaml rename to incubator/schema-registry-linking/environments/dogs/namespace.yaml index 24dde51..dda2905 100644 --- a/incubator/schema-registry-linking/environments/destination/namespace.yaml +++ b/incubator/schema-registry-linking/environments/dogs/namespace.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: destination + name: dogs diff --git a/incubator/schema-registry-linking/environments/destination/password-encoder-secret.yaml b/incubator/schema-registry-linking/environments/dogs/password-encoder-secret.yaml similarity index 100% rename from incubator/schema-registry-linking/environments/destination/password-encoder-secret.yaml rename to incubator/schema-registry-linking/environments/dogs/password-encoder-secret.yaml diff --git a/incubator/schema-registry-linking/environments/dogs/schema-registry.yaml b/incubator/schema-registry-linking/environments/dogs/schema-registry.yaml new file mode 100644 index 0000000..8c2c0de --- /dev/null +++ b/incubator/schema-registry-linking/environments/dogs/schema-registry.yaml @@ -0,0 +1,18 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: SchemaRegistry +metadata: + name: schemaregistry +spec: + replicas: 1 + image: + application: confluentinc/cp-schema-registry:7.1.0 + init: confluentinc/confluent-init-container:2.3.0 + passwordEncoder: + secretRef: password-encoder-secret + enableSchemaExporter: true + configOverrides: + server: + - kafkastore.topic.replication.factor=1 +# - leader.eligibility=false +# - schema.registry.group.id=id_schemaregistry_master +# - kafkastore.topic=_schemas diff --git a/incubator/schema-registry-linking/environments/destination/sr-linking-topic-demo.yaml b/incubator/schema-registry-linking/environments/dogs/sr-linking-topic-demo.yaml similarity index 63% rename from incubator/schema-registry-linking/environments/destination/sr-linking-topic-demo.yaml rename to incubator/schema-registry-linking/environments/dogs/sr-linking-topic-demo.yaml index 6d57fbe..5c12208 100644 --- a/incubator/schema-registry-linking/environments/destination/sr-linking-topic-demo.yaml +++ b/incubator/schema-registry-linking/environments/dogs/sr-linking-topic-demo.yaml @@ -1,11 +1,11 @@ apiVersion: platform.confluent.io/v1beta1 kind: KafkaTopic metadata: - name: sr-linking-topic-demo-destination + name: sr-linking-topic-demo-dogs spec: - replicas: 3 + replicas: 1 partitionCount: 4 configs: cleanup.policy: "delete" kafkaRestClassRef: - name: destination-kafka-rest \ No newline at end of file + name: dogs-kafka-rest \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/dogs/zookeeper.yaml b/incubator/schema-registry-linking/environments/dogs/zookeeper.yaml new file mode 100644 index 0000000..8c12602 --- /dev/null +++ b/incubator/schema-registry-linking/environments/dogs/zookeeper.yaml @@ -0,0 +1,6 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Zookeeper +metadata: + name: zookeeper +spec: + replicas: 1 \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/kustomization.yaml b/incubator/schema-registry-linking/environments/kustomization.yaml index 618cb86..ec1a128 100644 --- a/incubator/schema-registry-linking/environments/kustomization.yaml +++ b/incubator/schema-registry-linking/environments/kustomization.yaml @@ -1,5 +1,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - source - - destination + - master + - dogs + - cats + diff --git a/incubator/schema-registry-linking/environments/master/control-center.yaml b/incubator/schema-registry-linking/environments/master/control-center.yaml new file mode 100644 index 0000000..73907f7 --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/control-center.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: platform.confluent.io/v1beta1 +kind: ControlCenter +metadata: + name: controlcenter +spec: + configOverrides: + server: + - confluent.controlcenter.internal.topics.replication=1 + - confluent.controlcenter.command.topic.replication=1 + - confluent.monitoring.interceptor.topic.replication=1 + - confluent.metrics.topic.replication=1 \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/master/kafka.yaml b/incubator/schema-registry-linking/environments/master/kafka.yaml new file mode 100644 index 0000000..f8220e5 --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/kafka.yaml @@ -0,0 +1,23 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Kafka +metadata: + name: kafka +spec: + replicas: 1 + configOverrides: + server: + - confluent.schema.registry.url=http://schemaregistry:8081 + - confluent.balancer.topic.replication.factor=1 + - confluent.license.topic.replication.factor=1 + - confluent.tier.metadata.replication.factor=1 + - confluent.metadata.topic.replication.factor=1 + - confluent.metrics.reporter.topic.replicas=1 + - confluent.balancer.topic.replication.factor=1 + - confluent.security.event.logger.exporter.kafka.topic.replicas=1 + - default.replication.factor=1 + - event.logger.exporter.kafka.topic.replicas=1 + - offsets.topic.replication.factor=1 + + + + diff --git a/incubator/schema-registry-linking/environments/master/kustomization.yaml b/incubator/schema-registry-linking/environments/master/kustomization.yaml new file mode 100644 index 0000000..179691d --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/kustomization.yaml @@ -0,0 +1,17 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: master +resources: + - ../../../../base/cfk-components/confluent-no-auth-no-tls + - namespace.yaml + - schema-exporter-master-to-cats.yaml + - schema-exporter-master-to-dogs.yaml + - sr-linking-topic-demo.yaml + - master-rest-class.yaml + - password-encoder-secret.yaml + - schema-registry.yaml + - schemas +patchesStrategicMerge: + - kafka.yaml + - zookeeper.yaml + - control-center.yaml diff --git a/incubator/schema-registry-linking/environments/master/master-rest-class.yaml b/incubator/schema-registry-linking/environments/master/master-rest-class.yaml new file mode 100644 index 0000000..1db8f90 --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/master-rest-class.yaml @@ -0,0 +1,9 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: KafkaRestClass +metadata: + name: master-kafka-rest +spec: + kafkaClusterRef: + name: kafka + kafkaRest: + endpoint: http://kafka.master.svc.cluster.local:8090 diff --git a/incubator/schema-registry-linking/environments/master/namespace.yaml b/incubator/schema-registry-linking/environments/master/namespace.yaml new file mode 100644 index 0000000..1576af5 --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: master diff --git a/incubator/schema-registry-linking/environments/source/password-encoder-secret.yaml b/incubator/schema-registry-linking/environments/master/password-encoder-secret.yaml similarity index 100% rename from incubator/schema-registry-linking/environments/source/password-encoder-secret.yaml rename to incubator/schema-registry-linking/environments/master/password-encoder-secret.yaml diff --git a/incubator/schema-registry-linking/environments/source/schema-exporter.yaml b/incubator/schema-registry-linking/environments/master/schema-exporter-master-to-cats.yaml similarity index 60% rename from incubator/schema-registry-linking/environments/source/schema-exporter.yaml rename to incubator/schema-registry-linking/environments/master/schema-exporter-master-to-cats.yaml index fbad59a..42ff129 100644 --- a/incubator/schema-registry-linking/environments/source/schema-exporter.yaml +++ b/incubator/schema-registry-linking/environments/master/schema-exporter-master-to-cats.yaml @@ -1,16 +1,16 @@ apiVersion: platform.confluent.io/v1beta1 kind: SchemaExporter metadata: - name: schema-exporter-demo + name: schema-exporter-master-to-a spec: sourceCluster: schemaRegistryRest: - endpoint: http://schemaregistry.source.svc.cluster.local:8081 + endpoint: http://schemaregistry.master.svc.cluster.local:8081 destinationCluster: schemaRegistryRest: - endpoint: http://schemaregistry.destination.svc.cluster.local:8081 + endpoint: http://schemaregistry.cats.svc.cluster.local:8081 + contextType: NONE # subjects: --- [5] # subjectRenameFormat: --- [6] -# contextType: --- [7] # contextName: --- [8] # configs: --- [9] \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/master/schema-exporter-master-to-dogs.yaml b/incubator/schema-registry-linking/environments/master/schema-exporter-master-to-dogs.yaml new file mode 100644 index 0000000..471d2aa --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/schema-exporter-master-to-dogs.yaml @@ -0,0 +1,16 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: SchemaExporter +metadata: + name: schema-exporter-master-to-b +spec: + sourceCluster: + schemaRegistryRest: + endpoint: http://schemaregistry.master.svc.cluster.local:8081 + destinationCluster: + schemaRegistryRest: + endpoint: http://schemaregistry.dogs.svc.cluster.local:8081 + contextType: NONE +# subjects: --- [5] +# subjectRenameFormat: --- [6] +# contextName: --- [8] +# configs: --- [9] \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/master/schema-registry.yaml b/incubator/schema-registry-linking/environments/master/schema-registry.yaml new file mode 100644 index 0000000..9ebf33c --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/schema-registry.yaml @@ -0,0 +1,18 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: SchemaRegistry +metadata: + name: schemaregistry +spec: + replicas: 1 + image: + application: confluentinc/cp-schema-registry:7.1.0 + init: confluentinc/confluent-init-container:2.3.0 + passwordEncoder: + secretRef: password-encoder-secret + enableSchemaExporter: true + configOverrides: + server: + - kafkastore.topic.replication.factor=1 +# - leader.eligibility=true +# - schema.registry.group.id=id_schemaregistry_master +# - kafkastore.topic=_schemas diff --git a/incubator/schema-registry-linking/environments/master/schemas/basic-avro.yaml b/incubator/schema-registry-linking/environments/master/schemas/basic-avro.yaml new file mode 100644 index 0000000..b0922ef --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/schemas/basic-avro.yaml @@ -0,0 +1,36 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: basic-avro-schema-body +data: + schema: | + { + "namespace": "io.confluent.examples.clients.basicavro", + "type": "record", + "name": "Payment", + "fields": [ + {"name": "id", "type": "string"}, + {"name": "amount", "type": "double"}, + {"name": "email", "type": "string"} + ] + } +--- +apiVersion: platform.confluent.io/v1beta1 +kind: Schema +metadata: + name: basic-avro-schema-value +spec: + data: + configRef: basic-avro-schema-body + format: avro + schemaReferences: + - subject: basic-avro-schema-value + version: 1 + format: avro + avro: + avro: basic.avro.schema.fqdn + schemaRegistryClusterRef: + name: schemaregistry +# schemaRegistryRest: +# endpoint: http://schemaregistry:8081 +# name: If not set, the Schema CR name is used as the schema name. Use this property to define schema with context. \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/base/kustomization.yaml b/incubator/schema-registry-linking/environments/master/schemas/kustomization.yaml similarity index 73% rename from incubator/schema-registry-linking/environments/base/kustomization.yaml rename to incubator/schema-registry-linking/environments/master/schemas/kustomization.yaml index 1b41bd0..33fda77 100644 --- a/incubator/schema-registry-linking/environments/base/kustomization.yaml +++ b/incubator/schema-registry-linking/environments/master/schemas/kustomization.yaml @@ -1,6 +1,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - secrets - - confluent - + - basic-avro.yaml \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/master/sr-linking-topic-demo.yaml b/incubator/schema-registry-linking/environments/master/sr-linking-topic-demo.yaml new file mode 100644 index 0000000..b2fdd42 --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/sr-linking-topic-demo.yaml @@ -0,0 +1,11 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: KafkaTopic +metadata: + name: basic-avro-schema +spec: + replicas: 1 + partitionCount: 4 + configs: + cleanup.policy: "delete" + kafkaRestClassRef: + name: master-kafka-rest \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/master/zookeeper.yaml b/incubator/schema-registry-linking/environments/master/zookeeper.yaml new file mode 100644 index 0000000..8c12602 --- /dev/null +++ b/incubator/schema-registry-linking/environments/master/zookeeper.yaml @@ -0,0 +1,6 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Zookeeper +metadata: + name: zookeeper +spec: + replicas: 1 \ No newline at end of file diff --git a/incubator/schema-registry-linking/environments/source/clusterlink-encoder-secret.yaml b/incubator/schema-registry-linking/environments/source/clusterlink-encoder-secret.yaml deleted file mode 100644 index af6c51e..0000000 --- a/incubator/schema-registry-linking/environments/source/clusterlink-encoder-secret.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: v1 -data: - clusterlink_encoder_secret: c2VjcmV0PXNlY3JldA== -kind: Secret -metadata: - name: clusterlink-encoder-secret -type: Opaque diff --git a/incubator/schema-registry-linking/environments/source/kafka.yaml b/incubator/schema-registry-linking/environments/source/kafka.yaml deleted file mode 100644 index 6c598bd..0000000 --- a/incubator/schema-registry-linking/environments/source/kafka.yaml +++ /dev/null @@ -1,24 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: Kafka -metadata: - name: kafka -spec: - mountedSecrets: - - secretRef: clusterlink-encoder-secret - configOverrides: - server: - - confluent.cluster.link.enable=true - - password.encoder.secret=${file:/mnt/secrets/clusterlink-encoder-secret/clusterlink_encoder_secret:secret} -# - confluent.schema.registry.url=http://schemaregistry.source.svc.cluster.local:8081 - listeners: - external: - externalAccess: - type: loadBalancer - loadBalancer: - brokerPrefix: source - bootstrapPrefix: source - domain: oso-source - - - - diff --git a/incubator/schema-registry-linking/environments/source/schema-registry.yaml b/incubator/schema-registry-linking/environments/source/schema-registry.yaml deleted file mode 100644 index 6a76a99..0000000 --- a/incubator/schema-registry-linking/environments/source/schema-registry.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: platform.confluent.io/v1beta1 -kind: SchemaRegistry -metadata: - name: schemaregistry -spec: - passwordEncoder: - secretRef: password-encoder-secret - enableSchemaExporter: true - externalAccess: - type: loadBalancer - loadBalancer: - domain: oso-source \ No newline at end of file diff --git a/incubator/schema-registry-linking/testing/schema-creation.sh b/incubator/schema-registry-linking/testing/schema-creation.sh new file mode 100644 index 0000000..6f6be5d --- /dev/null +++ b/incubator/schema-registry-linking/testing/schema-creation.sh @@ -0,0 +1,5 @@ +curl --location --request POST 'http://localhost:8081/subjects/:.dogs:fido/versions' \ +--header 'Content-Type: application/json' \ +--data-raw '{ + "schema": "{\"type\":\"string\"}" +}' \ No newline at end of file From c08b898f83e7f3ec8c3e6ba24b4c741dc296c11c Mon Sep 17 00:00:00 2001 From: Andrew McCully Date: Wed, 8 Jun 2022 16:02:07 +0100 Subject: [PATCH 09/11] adding multi-DC SR example --- .../schema-registry-leader-follower/README.md | 88 +++++++++++++++++++ .../environments/cats/cats-rest-class.yaml | 9 ++ .../environments/cats/control-center.yaml | 12 +++ .../environments/cats/kafka.yaml | 20 +++++ .../environments/cats/kustomization.yaml | 13 +++ .../environments/cats/namespace.yaml | 4 + .../environments/cats/schema-registry.yaml | 19 ++++ .../cats/sr-linking-topic-demo.yaml | 11 +++ .../environments/cats/zookeeper.yaml | 6 ++ .../environments/dogs/control-center.yaml | 12 +++ .../environments/dogs/dogs-rest-class.yaml | 9 ++ .../environments/dogs/kafka.yaml | 20 +++++ .../environments/dogs/kustomization.yaml | 13 +++ .../environments/dogs/namespace.yaml | 4 + .../environments/dogs/schema-registry.yaml | 19 ++++ .../dogs/sr-linking-topic-demo.yaml | 11 +++ .../environments/dogs/zookeeper.yaml | 6 ++ .../environments/kustomization.yaml | 7 ++ .../environments/master/control-center.yaml | 12 +++ .../environments/master/kafka.yaml | 23 +++++ .../environments/master/kustomization.yaml | 14 +++ .../master/master-rest-class.yaml | 9 ++ .../environments/master/namespace.yaml | 4 + .../environments/master/schema-registry.yaml | 15 ++++ .../master/schemas/basic-avro.yaml | 36 ++++++++ .../master/schemas/kustomization.yaml | 4 + .../master/sr-linking-topic-demo.yaml | 11 +++ .../environments/master/zookeeper.yaml | 6 ++ .../kustomization.yaml | 7 ++ 29 files changed, 424 insertions(+) create mode 100644 incubator/schema-registry-leader-follower/README.md create mode 100644 incubator/schema-registry-leader-follower/environments/cats/cats-rest-class.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/cats/control-center.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/cats/kafka.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/cats/kustomization.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/cats/namespace.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/cats/schema-registry.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/cats/sr-linking-topic-demo.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/cats/zookeeper.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/dogs/control-center.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/dogs/dogs-rest-class.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/dogs/kafka.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/dogs/kustomization.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/dogs/namespace.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/dogs/schema-registry.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/dogs/sr-linking-topic-demo.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/dogs/zookeeper.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/kustomization.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/control-center.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/kafka.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/kustomization.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/master-rest-class.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/namespace.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/schema-registry.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/schemas/basic-avro.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/schemas/kustomization.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/sr-linking-topic-demo.yaml create mode 100644 incubator/schema-registry-leader-follower/environments/master/zookeeper.yaml create mode 100644 incubator/schema-registry-leader-follower/kustomization.yaml diff --git a/incubator/schema-registry-leader-follower/README.md b/incubator/schema-registry-leader-follower/README.md new file mode 100644 index 0000000..02bd4ce --- /dev/null +++ b/incubator/schema-registry-leader-follower/README.md @@ -0,0 +1,88 @@ +# Basic Deployment +This example deploys a basic deployment. No RBAC/LDAP. Just a single topic 'foobar' is added as part of the pipeline. + + +| Feature | Enabled | Note | +|:-----------------|:-------:|:-------------------------| +| Kafka/Zookeeper | ✅ | | +| Control Center | ✅ | | +| Connect | ❌ | | +| Schema Registry | ❌ | | +| KSQL | ❌ | | +| TLS Encryption | ✅ | Self-signed certificates | +| Authentication | ✅ | | +| Authorization | ✅ | via LDAP | + + +### Deploy CRDs +Deploy the CRDS using the standard way: +```shell +kubectl apply -k ../../base/crds +``` +### Deploy Confluent Operator and Confluent Services +Deploy the confluent operator and services: +```shell +kubectl apply -k . +``` + +### Forward ports locally. +#### Source Kafka +Minikube:source:kafka:9071 -> localhost:9071 +#### Source SchemaRegistry +Minikube:source:schemaregistry:9081 -> localhost:9081 +#### Source Kafka +Minikube:destination:kafka:9071 -> localhost:9072 +#### Source Kafka +Minikube:source:schemaregistry:9081 -> localhost:9082 + +```shell + +nohup kubectl port-forward schemaregistry-0 8081:8081 --namespace master \ +&& \ +nohup kubectl port-forward schemaregistry-0 8082:8081 --namespace dogs \ +&& \ +nohup kubectl port-forward schemaregistry-0 8083:8081 --namespace cats + +``` +kubectl port-forward \ +$(kubectl get pods -n source -l statefulset.kubernetes.io/pod-name:kafka-0 -o name) \ +:9071 -n source \ +&& \ +kubectl port-forward \ +$(kubectl get pods -n source -l app.kubernetes.io/component=grafana -o name) \ +:9071 -n source \ +&& \ +kubectl port-forward \ +$(kubectl get pods -n source -l app.kubernetes.io/component=grafana -o name) \ +9071 -n source +&& \ +kubectl port-forward \ +$(kubectl get pods -n source -l app.kubernetes.io/component=grafana -o name) \ +9071 -n source + +``` + +### Query schema Registry + +[//]: # (TODO Port forward Production Schema Registry - 8081) +[//]: # (TODO Port forward Production Kafka Broker - 9092) + +``` +curl -k -X POST -H "Content-Type: application/vnd.schemaregistry.v1+json" \ + --data '{"schema": "{\"type\": \"string\"}"}' \ + https://localhost:8081/subjects/im-a-source-schema/versions +``` + + + +``` +curl -k -X POST -H "Content-Type: application/vnd.schemaregistry.v1+json" \ + --data '{"schema": "{\"type\": \"string\"}"}' \ + https://localhost:8082/subjects/im-a-desgination-schema/versions +```10.109.90.121 + +`curl -k -X GET https://10.109.90.121:8081/subjects` + +`curl -k -X GET https://localhost:8082/subjects` + +#TODO - how will \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/cats/cats-rest-class.yaml b/incubator/schema-registry-leader-follower/environments/cats/cats-rest-class.yaml new file mode 100644 index 0000000..c9f8990 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/cats/cats-rest-class.yaml @@ -0,0 +1,9 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: KafkaRestClass +metadata: + name: cats-kafka-rest +spec: + kafkaClusterRef: + name: kafka + kafkaRest: + endpoint: http://kafka.cats.svc.cluster.local:8090 diff --git a/incubator/schema-registry-leader-follower/environments/cats/control-center.yaml b/incubator/schema-registry-leader-follower/environments/cats/control-center.yaml new file mode 100644 index 0000000..73907f7 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/cats/control-center.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: platform.confluent.io/v1beta1 +kind: ControlCenter +metadata: + name: controlcenter +spec: + configOverrides: + server: + - confluent.controlcenter.internal.topics.replication=1 + - confluent.controlcenter.command.topic.replication=1 + - confluent.monitoring.interceptor.topic.replication=1 + - confluent.metrics.topic.replication=1 \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/cats/kafka.yaml b/incubator/schema-registry-leader-follower/environments/cats/kafka.yaml new file mode 100644 index 0000000..9627373 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/cats/kafka.yaml @@ -0,0 +1,20 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Kafka +metadata: + name: kafka +spec: + replicas: 1 + configOverrides: + server: + - confluent.schema.registry.url=http://schemaregistry:8081 + - confluent.balancer.topic.replication.factor=1 + - confluent.license.topic.replication.factor=1 + - confluent.tier.metadata.replication.factor=1 + - confluent.metadata.topic.replication.factor=1 + - confluent.metrics.reporter.topic.replicas=1 + - confluent.balancer.topic.replication.factor=1 + - confluent.security.event.logger.exporter.kafka.topic.replicas=1 + - default.replication.factor=1 + - event.logger.exporter.kafka.topic.replicas=1 + - offsets.topic.replication.factor=1 + diff --git a/incubator/schema-registry-leader-follower/environments/cats/kustomization.yaml b/incubator/schema-registry-leader-follower/environments/cats/kustomization.yaml new file mode 100644 index 0000000..2a64b33 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/cats/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: cats +resources: + - namespace.yaml + - ../../../../base/cfk-components/confluent-no-auth-no-tls + - sr-linking-topic-demo.yaml + - schema-registry.yaml + - cats-rest-class.yaml +patchesStrategicMerge: + - kafka.yaml + - zookeeper.yaml + - control-center.yaml \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/cats/namespace.yaml b/incubator/schema-registry-leader-follower/environments/cats/namespace.yaml new file mode 100644 index 0000000..95bddf9 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/cats/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: cats diff --git a/incubator/schema-registry-leader-follower/environments/cats/schema-registry.yaml b/incubator/schema-registry-leader-follower/environments/cats/schema-registry.yaml new file mode 100644 index 0000000..28ca790 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/cats/schema-registry.yaml @@ -0,0 +1,19 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: SchemaRegistry +metadata: + name: schemaregistry +spec: + replicas: 1 + image: + application: confluentinc/cp-schema-registry:7.1.0 + init: confluentinc/confluent-init-container:2.3.0 + configOverrides: + server: + - kafkastore.topic.replication.factor=1 + - leader.eligibility=false + - unclean.leader.election.enable=false + - schema.registry.group.id=id_schemaregistry_master + - kafkastore.topic=_schemas + dependencies: + kafka: + bootstrapEndpoint: http://kafka.master.svc.cluster.local:9071 \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/cats/sr-linking-topic-demo.yaml b/incubator/schema-registry-leader-follower/environments/cats/sr-linking-topic-demo.yaml new file mode 100644 index 0000000..be3f505 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/cats/sr-linking-topic-demo.yaml @@ -0,0 +1,11 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: KafkaTopic +metadata: + name: sr-linking-topic-demo-cats +spec: + replicas: 1 + partitionCount: 4 + configs: + cleanup.policy: "delete" + kafkaRestClassRef: + name: cats-kafka-rest \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/cats/zookeeper.yaml b/incubator/schema-registry-leader-follower/environments/cats/zookeeper.yaml new file mode 100644 index 0000000..8c12602 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/cats/zookeeper.yaml @@ -0,0 +1,6 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Zookeeper +metadata: + name: zookeeper +spec: + replicas: 1 \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/dogs/control-center.yaml b/incubator/schema-registry-leader-follower/environments/dogs/control-center.yaml new file mode 100644 index 0000000..73907f7 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/dogs/control-center.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: platform.confluent.io/v1beta1 +kind: ControlCenter +metadata: + name: controlcenter +spec: + configOverrides: + server: + - confluent.controlcenter.internal.topics.replication=1 + - confluent.controlcenter.command.topic.replication=1 + - confluent.monitoring.interceptor.topic.replication=1 + - confluent.metrics.topic.replication=1 \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/dogs/dogs-rest-class.yaml b/incubator/schema-registry-leader-follower/environments/dogs/dogs-rest-class.yaml new file mode 100644 index 0000000..d385ce4 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/dogs/dogs-rest-class.yaml @@ -0,0 +1,9 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: KafkaRestClass +metadata: + name: dogs-kafka-rest +spec: + kafkaClusterRef: + name: kafka + kafkaRest: + endpoint: http://kafka.dogs.svc.cluster.local:8090 diff --git a/incubator/schema-registry-leader-follower/environments/dogs/kafka.yaml b/incubator/schema-registry-leader-follower/environments/dogs/kafka.yaml new file mode 100644 index 0000000..9627373 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/dogs/kafka.yaml @@ -0,0 +1,20 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Kafka +metadata: + name: kafka +spec: + replicas: 1 + configOverrides: + server: + - confluent.schema.registry.url=http://schemaregistry:8081 + - confluent.balancer.topic.replication.factor=1 + - confluent.license.topic.replication.factor=1 + - confluent.tier.metadata.replication.factor=1 + - confluent.metadata.topic.replication.factor=1 + - confluent.metrics.reporter.topic.replicas=1 + - confluent.balancer.topic.replication.factor=1 + - confluent.security.event.logger.exporter.kafka.topic.replicas=1 + - default.replication.factor=1 + - event.logger.exporter.kafka.topic.replicas=1 + - offsets.topic.replication.factor=1 + diff --git a/incubator/schema-registry-leader-follower/environments/dogs/kustomization.yaml b/incubator/schema-registry-leader-follower/environments/dogs/kustomization.yaml new file mode 100644 index 0000000..223e3f8 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/dogs/kustomization.yaml @@ -0,0 +1,13 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: dogs +resources: + - namespace.yaml + - ../../../../base/cfk-components/confluent-no-auth-no-tls + - sr-linking-topic-demo.yaml + - schema-registry.yaml + - dogs-rest-class.yaml +patchesStrategicMerge: + - kafka.yaml + - zookeeper.yaml + - control-center.yaml diff --git a/incubator/schema-registry-leader-follower/environments/dogs/namespace.yaml b/incubator/schema-registry-leader-follower/environments/dogs/namespace.yaml new file mode 100644 index 0000000..dda2905 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/dogs/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: dogs diff --git a/incubator/schema-registry-leader-follower/environments/dogs/schema-registry.yaml b/incubator/schema-registry-leader-follower/environments/dogs/schema-registry.yaml new file mode 100644 index 0000000..28ca790 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/dogs/schema-registry.yaml @@ -0,0 +1,19 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: SchemaRegistry +metadata: + name: schemaregistry +spec: + replicas: 1 + image: + application: confluentinc/cp-schema-registry:7.1.0 + init: confluentinc/confluent-init-container:2.3.0 + configOverrides: + server: + - kafkastore.topic.replication.factor=1 + - leader.eligibility=false + - unclean.leader.election.enable=false + - schema.registry.group.id=id_schemaregistry_master + - kafkastore.topic=_schemas + dependencies: + kafka: + bootstrapEndpoint: http://kafka.master.svc.cluster.local:9071 \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/dogs/sr-linking-topic-demo.yaml b/incubator/schema-registry-leader-follower/environments/dogs/sr-linking-topic-demo.yaml new file mode 100644 index 0000000..5c12208 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/dogs/sr-linking-topic-demo.yaml @@ -0,0 +1,11 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: KafkaTopic +metadata: + name: sr-linking-topic-demo-dogs +spec: + replicas: 1 + partitionCount: 4 + configs: + cleanup.policy: "delete" + kafkaRestClassRef: + name: dogs-kafka-rest \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/dogs/zookeeper.yaml b/incubator/schema-registry-leader-follower/environments/dogs/zookeeper.yaml new file mode 100644 index 0000000..8c12602 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/dogs/zookeeper.yaml @@ -0,0 +1,6 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Zookeeper +metadata: + name: zookeeper +spec: + replicas: 1 \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/kustomization.yaml b/incubator/schema-registry-leader-follower/environments/kustomization.yaml new file mode 100644 index 0000000..ec1a128 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - master + - dogs + - cats + diff --git a/incubator/schema-registry-leader-follower/environments/master/control-center.yaml b/incubator/schema-registry-leader-follower/environments/master/control-center.yaml new file mode 100644 index 0000000..73907f7 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/control-center.yaml @@ -0,0 +1,12 @@ +--- +apiVersion: platform.confluent.io/v1beta1 +kind: ControlCenter +metadata: + name: controlcenter +spec: + configOverrides: + server: + - confluent.controlcenter.internal.topics.replication=1 + - confluent.controlcenter.command.topic.replication=1 + - confluent.monitoring.interceptor.topic.replication=1 + - confluent.metrics.topic.replication=1 \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/master/kafka.yaml b/incubator/schema-registry-leader-follower/environments/master/kafka.yaml new file mode 100644 index 0000000..f8220e5 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/kafka.yaml @@ -0,0 +1,23 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Kafka +metadata: + name: kafka +spec: + replicas: 1 + configOverrides: + server: + - confluent.schema.registry.url=http://schemaregistry:8081 + - confluent.balancer.topic.replication.factor=1 + - confluent.license.topic.replication.factor=1 + - confluent.tier.metadata.replication.factor=1 + - confluent.metadata.topic.replication.factor=1 + - confluent.metrics.reporter.topic.replicas=1 + - confluent.balancer.topic.replication.factor=1 + - confluent.security.event.logger.exporter.kafka.topic.replicas=1 + - default.replication.factor=1 + - event.logger.exporter.kafka.topic.replicas=1 + - offsets.topic.replication.factor=1 + + + + diff --git a/incubator/schema-registry-leader-follower/environments/master/kustomization.yaml b/incubator/schema-registry-leader-follower/environments/master/kustomization.yaml new file mode 100644 index 0000000..67b0adc --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/kustomization.yaml @@ -0,0 +1,14 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +namespace: master +resources: + - ../../../../base/cfk-components/confluent-no-auth-no-tls + - namespace.yaml + - sr-linking-topic-demo.yaml + - master-rest-class.yaml + - schema-registry.yaml + - schemas +patchesStrategicMerge: + - kafka.yaml + - zookeeper.yaml + - control-center.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/master-rest-class.yaml b/incubator/schema-registry-leader-follower/environments/master/master-rest-class.yaml new file mode 100644 index 0000000..1db8f90 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/master-rest-class.yaml @@ -0,0 +1,9 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: KafkaRestClass +metadata: + name: master-kafka-rest +spec: + kafkaClusterRef: + name: kafka + kafkaRest: + endpoint: http://kafka.master.svc.cluster.local:8090 diff --git a/incubator/schema-registry-leader-follower/environments/master/namespace.yaml b/incubator/schema-registry-leader-follower/environments/master/namespace.yaml new file mode 100644 index 0000000..1576af5 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/namespace.yaml @@ -0,0 +1,4 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: master diff --git a/incubator/schema-registry-leader-follower/environments/master/schema-registry.yaml b/incubator/schema-registry-leader-follower/environments/master/schema-registry.yaml new file mode 100644 index 0000000..6c7bf73 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/schema-registry.yaml @@ -0,0 +1,15 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: SchemaRegistry +metadata: + name: schemaregistry +spec: + replicas: 1 + image: + application: confluentinc/cp-schema-registry:7.1.0 + init: confluentinc/confluent-init-container:2.3.0 + configOverrides: + server: + - kafkastore.topic.replication.factor=1 + - leader.eligibility=true + - schema.registry.group.id=id_schemaregistry_master + - kafkastore.topic=_schemas diff --git a/incubator/schema-registry-leader-follower/environments/master/schemas/basic-avro.yaml b/incubator/schema-registry-leader-follower/environments/master/schemas/basic-avro.yaml new file mode 100644 index 0000000..b0922ef --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/schemas/basic-avro.yaml @@ -0,0 +1,36 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: basic-avro-schema-body +data: + schema: | + { + "namespace": "io.confluent.examples.clients.basicavro", + "type": "record", + "name": "Payment", + "fields": [ + {"name": "id", "type": "string"}, + {"name": "amount", "type": "double"}, + {"name": "email", "type": "string"} + ] + } +--- +apiVersion: platform.confluent.io/v1beta1 +kind: Schema +metadata: + name: basic-avro-schema-value +spec: + data: + configRef: basic-avro-schema-body + format: avro + schemaReferences: + - subject: basic-avro-schema-value + version: 1 + format: avro + avro: + avro: basic.avro.schema.fqdn + schemaRegistryClusterRef: + name: schemaregistry +# schemaRegistryRest: +# endpoint: http://schemaregistry:8081 +# name: If not set, the Schema CR name is used as the schema name. Use this property to define schema with context. \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/master/schemas/kustomization.yaml b/incubator/schema-registry-leader-follower/environments/master/schemas/kustomization.yaml new file mode 100644 index 0000000..33fda77 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/schemas/kustomization.yaml @@ -0,0 +1,4 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: + - basic-avro.yaml \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/master/sr-linking-topic-demo.yaml b/incubator/schema-registry-leader-follower/environments/master/sr-linking-topic-demo.yaml new file mode 100644 index 0000000..b2fdd42 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/sr-linking-topic-demo.yaml @@ -0,0 +1,11 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: KafkaTopic +metadata: + name: basic-avro-schema +spec: + replicas: 1 + partitionCount: 4 + configs: + cleanup.policy: "delete" + kafkaRestClassRef: + name: master-kafka-rest \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/environments/master/zookeeper.yaml b/incubator/schema-registry-leader-follower/environments/master/zookeeper.yaml new file mode 100644 index 0000000..8c12602 --- /dev/null +++ b/incubator/schema-registry-leader-follower/environments/master/zookeeper.yaml @@ -0,0 +1,6 @@ +apiVersion: platform.confluent.io/v1beta1 +kind: Zookeeper +metadata: + name: zookeeper +spec: + replicas: 1 \ No newline at end of file diff --git a/incubator/schema-registry-leader-follower/kustomization.yaml b/incubator/schema-registry-leader-follower/kustomization.yaml new file mode 100644 index 0000000..5897096 --- /dev/null +++ b/incubator/schema-registry-leader-follower/kustomization.yaml @@ -0,0 +1,7 @@ +apiVersion: kustomize.config.k8s.io/v1beta1 +kind: Kustomization +resources: +- environments + + + From 487e433e81c1d6c4cd972001f2afe70dd732fcf8 Mon Sep 17 00:00:00 2001 From: Andrew McCully Date: Thu, 9 Jun 2022 14:35:48 +0100 Subject: [PATCH 10/11] Renamed folders in incubator --- .../README.md | 0 .../environments/cats/cats-rest-class.yaml | 0 .../environments/cats/control-center.yaml | 0 .../environments/cats/kafka.yaml | 0 .../environments/cats/kustomization.yaml | 0 .../environments/cats/namespace.yaml | 0 .../environments/cats/schema-registry.yaml | 0 .../environments/cats/sr-linking-topic-demo.yaml | 0 .../environments/cats/zookeeper.yaml | 0 .../environments/dogs/control-center.yaml | 0 .../environments/dogs/dogs-rest-class.yaml | 0 .../environments/dogs/kafka.yaml | 0 .../environments/dogs/kustomization.yaml | 0 .../environments/dogs/namespace.yaml | 0 .../environments/dogs/schema-registry.yaml | 0 .../environments/dogs/sr-linking-topic-demo.yaml | 0 .../environments/dogs/zookeeper.yaml | 0 .../environments/kustomization.yaml | 0 .../environments/master/control-center.yaml | 0 .../environments/master/kafka.yaml | 0 .../environments/master/kustomization.yaml | 0 .../environments/master/master-rest-class.yaml | 0 .../environments/master/namespace.yaml | 0 .../environments/master/schema-registry.yaml | 2 +- .../environments/master/schemas/basic-avro.yaml | 0 .../environments/master/schemas/kustomization.yaml | 0 .../environments/master/sr-linking-topic-demo.yaml | 0 .../environments/master/zookeeper.yaml | 0 .../kustomization.yaml | 0 .../environments/master/schema-exporter-master-to-cats.yaml | 4 ++-- 30 files changed, 3 insertions(+), 3 deletions(-) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/README.md (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/cats/cats-rest-class.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/cats/control-center.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/cats/kafka.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/cats/kustomization.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/cats/namespace.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/cats/schema-registry.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/cats/sr-linking-topic-demo.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/cats/zookeeper.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/dogs/control-center.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/dogs/dogs-rest-class.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/dogs/kafka.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/dogs/kustomization.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/dogs/namespace.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/dogs/schema-registry.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/dogs/sr-linking-topic-demo.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/dogs/zookeeper.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/kustomization.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/control-center.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/kafka.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/kustomization.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/master-rest-class.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/namespace.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/schema-registry.yaml (96%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/schemas/basic-avro.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/schemas/kustomization.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/sr-linking-topic-demo.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/environments/master/zookeeper.yaml (100%) rename incubator/{schema-registry-leader-follower => multi-dc-schema-registry-leader-follower}/kustomization.yaml (100%) diff --git a/incubator/schema-registry-leader-follower/README.md b/incubator/multi-dc-schema-registry-leader-follower/README.md similarity index 100% rename from incubator/schema-registry-leader-follower/README.md rename to incubator/multi-dc-schema-registry-leader-follower/README.md diff --git a/incubator/schema-registry-leader-follower/environments/cats/cats-rest-class.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/cats/cats-rest-class.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/cats/cats-rest-class.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/cats/cats-rest-class.yaml diff --git a/incubator/schema-registry-leader-follower/environments/cats/control-center.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/cats/control-center.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/cats/control-center.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/cats/control-center.yaml diff --git a/incubator/schema-registry-leader-follower/environments/cats/kafka.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/cats/kafka.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/cats/kafka.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/cats/kafka.yaml diff --git a/incubator/schema-registry-leader-follower/environments/cats/kustomization.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/cats/kustomization.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/cats/kustomization.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/cats/kustomization.yaml diff --git a/incubator/schema-registry-leader-follower/environments/cats/namespace.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/cats/namespace.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/cats/namespace.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/cats/namespace.yaml diff --git a/incubator/schema-registry-leader-follower/environments/cats/schema-registry.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/cats/schema-registry.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/cats/schema-registry.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/cats/schema-registry.yaml diff --git a/incubator/schema-registry-leader-follower/environments/cats/sr-linking-topic-demo.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/cats/sr-linking-topic-demo.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/cats/sr-linking-topic-demo.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/cats/sr-linking-topic-demo.yaml diff --git a/incubator/schema-registry-leader-follower/environments/cats/zookeeper.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/cats/zookeeper.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/cats/zookeeper.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/cats/zookeeper.yaml diff --git a/incubator/schema-registry-leader-follower/environments/dogs/control-center.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/dogs/control-center.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/dogs/control-center.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/dogs/control-center.yaml diff --git a/incubator/schema-registry-leader-follower/environments/dogs/dogs-rest-class.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/dogs/dogs-rest-class.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/dogs/dogs-rest-class.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/dogs/dogs-rest-class.yaml diff --git a/incubator/schema-registry-leader-follower/environments/dogs/kafka.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/dogs/kafka.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/dogs/kafka.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/dogs/kafka.yaml diff --git a/incubator/schema-registry-leader-follower/environments/dogs/kustomization.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/dogs/kustomization.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/dogs/kustomization.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/dogs/kustomization.yaml diff --git a/incubator/schema-registry-leader-follower/environments/dogs/namespace.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/dogs/namespace.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/dogs/namespace.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/dogs/namespace.yaml diff --git a/incubator/schema-registry-leader-follower/environments/dogs/schema-registry.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/dogs/schema-registry.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/dogs/schema-registry.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/dogs/schema-registry.yaml diff --git a/incubator/schema-registry-leader-follower/environments/dogs/sr-linking-topic-demo.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/dogs/sr-linking-topic-demo.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/dogs/sr-linking-topic-demo.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/dogs/sr-linking-topic-demo.yaml diff --git a/incubator/schema-registry-leader-follower/environments/dogs/zookeeper.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/dogs/zookeeper.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/dogs/zookeeper.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/dogs/zookeeper.yaml diff --git a/incubator/schema-registry-leader-follower/environments/kustomization.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/kustomization.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/kustomization.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/kustomization.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/control-center.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/control-center.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/master/control-center.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/control-center.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/kafka.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/kafka.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/master/kafka.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/kafka.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/kustomization.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/kustomization.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/master/kustomization.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/kustomization.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/master-rest-class.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/master-rest-class.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/master/master-rest-class.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/master-rest-class.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/namespace.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/namespace.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/master/namespace.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/namespace.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/schema-registry.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/schema-registry.yaml similarity index 96% rename from incubator/schema-registry-leader-follower/environments/master/schema-registry.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/schema-registry.yaml index 6c7bf73..24863a8 100644 --- a/incubator/schema-registry-leader-follower/environments/master/schema-registry.yaml +++ b/incubator/multi-dc-schema-registry-leader-follower/environments/master/schema-registry.yaml @@ -3,7 +3,7 @@ kind: SchemaRegistry metadata: name: schemaregistry spec: - replicas: 1 + replicas: 0 image: application: confluentinc/cp-schema-registry:7.1.0 init: confluentinc/confluent-init-container:2.3.0 diff --git a/incubator/schema-registry-leader-follower/environments/master/schemas/basic-avro.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/schemas/basic-avro.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/master/schemas/basic-avro.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/schemas/basic-avro.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/schemas/kustomization.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/schemas/kustomization.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/master/schemas/kustomization.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/schemas/kustomization.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/sr-linking-topic-demo.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/sr-linking-topic-demo.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/master/sr-linking-topic-demo.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/sr-linking-topic-demo.yaml diff --git a/incubator/schema-registry-leader-follower/environments/master/zookeeper.yaml b/incubator/multi-dc-schema-registry-leader-follower/environments/master/zookeeper.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/environments/master/zookeeper.yaml rename to incubator/multi-dc-schema-registry-leader-follower/environments/master/zookeeper.yaml diff --git a/incubator/schema-registry-leader-follower/kustomization.yaml b/incubator/multi-dc-schema-registry-leader-follower/kustomization.yaml similarity index 100% rename from incubator/schema-registry-leader-follower/kustomization.yaml rename to incubator/multi-dc-schema-registry-leader-follower/kustomization.yaml diff --git a/incubator/schema-registry-linking/environments/master/schema-exporter-master-to-cats.yaml b/incubator/schema-registry-linking/environments/master/schema-exporter-master-to-cats.yaml index 42ff129..61bd98c 100644 --- a/incubator/schema-registry-linking/environments/master/schema-exporter-master-to-cats.yaml +++ b/incubator/schema-registry-linking/environments/master/schema-exporter-master-to-cats.yaml @@ -9,8 +9,8 @@ spec: destinationCluster: schemaRegistryRest: endpoint: http://schemaregistry.cats.svc.cluster.local:8081 - contextType: NONE + contextType: AUTO # subjects: --- [5] # subjectRenameFormat: --- [6] -# contextName: --- [8] +# contextName: # configs: --- [9] \ No newline at end of file From 3949a9e0714f8f6d07f2ed8ef32436a577792f3c Mon Sep 17 00:00:00 2001 From: Andrew McCully Date: Mon, 13 Jun 2022 16:21:16 +0100 Subject: [PATCH 11/11] moving quotas to incubator --- {stable => incubator}/quotas/confluent/kafka.yaml | 0 {stable => incubator}/quotas/docker/Dockerfile | 0 {stable => incubator}/quotas/docker/build-inside.sh | 0 {stable => incubator}/quotas/kustomization.yaml | 0 {stable => incubator}/quotas/namespace.yaml | 0 .../quotas/quota-manager/default/apply-quotas-script.sh | 0 .../quotas/quota-manager/default/kafka.properties | 0 {stable => incubator}/quotas/quota-manager/default/quotas.yaml | 0 {stable => incubator}/quotas/quota-manager/kustomization.yaml | 0 {stable => incubator}/quotas/quota-manager/quota-manager.yaml | 0 10 files changed, 0 insertions(+), 0 deletions(-) rename {stable => incubator}/quotas/confluent/kafka.yaml (100%) rename {stable => incubator}/quotas/docker/Dockerfile (100%) rename {stable => incubator}/quotas/docker/build-inside.sh (100%) rename {stable => incubator}/quotas/kustomization.yaml (100%) rename {stable => incubator}/quotas/namespace.yaml (100%) rename {stable => incubator}/quotas/quota-manager/default/apply-quotas-script.sh (100%) rename {stable => incubator}/quotas/quota-manager/default/kafka.properties (100%) rename {stable => incubator}/quotas/quota-manager/default/quotas.yaml (100%) rename {stable => incubator}/quotas/quota-manager/kustomization.yaml (100%) rename {stable => incubator}/quotas/quota-manager/quota-manager.yaml (100%) diff --git a/stable/quotas/confluent/kafka.yaml b/incubator/quotas/confluent/kafka.yaml similarity index 100% rename from stable/quotas/confluent/kafka.yaml rename to incubator/quotas/confluent/kafka.yaml diff --git a/stable/quotas/docker/Dockerfile b/incubator/quotas/docker/Dockerfile similarity index 100% rename from stable/quotas/docker/Dockerfile rename to incubator/quotas/docker/Dockerfile diff --git a/stable/quotas/docker/build-inside.sh b/incubator/quotas/docker/build-inside.sh similarity index 100% rename from stable/quotas/docker/build-inside.sh rename to incubator/quotas/docker/build-inside.sh diff --git a/stable/quotas/kustomization.yaml b/incubator/quotas/kustomization.yaml similarity index 100% rename from stable/quotas/kustomization.yaml rename to incubator/quotas/kustomization.yaml diff --git a/stable/quotas/namespace.yaml b/incubator/quotas/namespace.yaml similarity index 100% rename from stable/quotas/namespace.yaml rename to incubator/quotas/namespace.yaml diff --git a/stable/quotas/quota-manager/default/apply-quotas-script.sh b/incubator/quotas/quota-manager/default/apply-quotas-script.sh similarity index 100% rename from stable/quotas/quota-manager/default/apply-quotas-script.sh rename to incubator/quotas/quota-manager/default/apply-quotas-script.sh diff --git a/stable/quotas/quota-manager/default/kafka.properties b/incubator/quotas/quota-manager/default/kafka.properties similarity index 100% rename from stable/quotas/quota-manager/default/kafka.properties rename to incubator/quotas/quota-manager/default/kafka.properties diff --git a/stable/quotas/quota-manager/default/quotas.yaml b/incubator/quotas/quota-manager/default/quotas.yaml similarity index 100% rename from stable/quotas/quota-manager/default/quotas.yaml rename to incubator/quotas/quota-manager/default/quotas.yaml diff --git a/stable/quotas/quota-manager/kustomization.yaml b/incubator/quotas/quota-manager/kustomization.yaml similarity index 100% rename from stable/quotas/quota-manager/kustomization.yaml rename to incubator/quotas/quota-manager/kustomization.yaml diff --git a/stable/quotas/quota-manager/quota-manager.yaml b/incubator/quotas/quota-manager/quota-manager.yaml similarity index 100% rename from stable/quotas/quota-manager/quota-manager.yaml rename to incubator/quotas/quota-manager/quota-manager.yaml