updated script to allow for global options

Author: mccullya

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
+
+

stable/quotas/kustomization.yaml

@@ -4,4 +4,6 @@ namespace: sandbox
 resources:
 - namespace.yaml
 - ../../base/cfk-components/confluent-rbac
-
+- quota-manager
+patchesStrategicMerge:
+  - confluent/kafka.yaml

stable/quotas/quota-manager/definition/apply-quotas-script.sh renamed to 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

stable/quotas/quota-manager/definition/kafka.properties renamed to stable/quotas/quota-manager/default/kafka.properties

@@ -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

stable/quotas/quota-manager/definition/quotas.yaml renamed to stable/quotas/quota-manager/default/quotas.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

stable/quotas/quota-manager/kustomization.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