diff --git a/packages/core/platform/sources/kafka-operator.yaml b/packages/core/platform/sources/kafka-operator.yaml index 83d7d5023..a2fb60193 100644 --- a/packages/core/platform/sources/kafka-operator.yaml +++ b/packages/core/platform/sources/kafka-operator.yaml @@ -20,3 +20,9 @@ spec: install: namespace: cozy-kafka-operator releaseName: kafka-operator + # helm-controller defaults CRD upgrades to Skip, which would leave the + # Strimzi CRDs at whatever version first installed them. Replacing them + # with v1-only CRDs requires every stored object to be v1 already; the + # platform migration that converts them runs before this release on the + # variants that run platform migrations. + upgradeCRDs: CreateReplace diff --git a/packages/core/platform/tests/sources_kafka_operator_crds_test.yaml b/packages/core/platform/tests/sources_kafka_operator_crds_test.yaml new file mode 100644 index 000000000..b0ac30839 --- /dev/null +++ b/packages/core/platform/tests/sources_kafka_operator_crds_test.yaml @@ -0,0 +1,18 @@ +suite: kafka-operator applies CRD updates on upgrade +# Strimzi 1.x serves only the v1 API. Helm never upgrades CRDs shipped in +# crds/, so without CreateReplace an upgraded cluster keeps the v1beta2-only +# CRDs of its first install and the 1.x operator cannot work with them. +templates: + - templates/sources.yaml +release: + name: cozystack + namespace: cozy-system +tests: + - it: kafka-operator PackageSource sets upgradeCRDs to CreateReplace + documentSelector: + path: metadata.name + value: cozystack.kafka-operator + asserts: + - equal: + path: spec.variants[0].components[0].install.upgradeCRDs + value: CreateReplace diff --git a/packages/system/kafka-operator/Makefile b/packages/system/kafka-operator/Makefile index 30c35e912..fb8122538 100644 --- a/packages/system/kafka-operator/Makefile +++ b/packages/system/kafka-operator/Makefile @@ -8,4 +8,4 @@ test: update: rm -rf charts - helm pull oci://quay.io/strimzi-helm/strimzi-kafka-operator --untar --untardir charts --version 0.45.1-rc1 + helm pull oci://quay.io/strimzi-helm/strimzi-kafka-operator --untar --untardir charts --version 1.2.0 diff --git a/packages/system/kafka-operator/alerts/prometheus-rules.yaml b/packages/system/kafka-operator/alerts/prometheus-rules.yaml index 760ca5dad..2ef8226bd 100644 --- a/packages/system/kafka-operator/alerts/prometheus-rules.yaml +++ b/packages/system/kafka-operator/alerts/prometheus-rules.yaml @@ -89,48 +89,6 @@ spec: annotations: summary: 'One or more Kafka containers restarted too often' description: 'One or more Kafka containers were restarted too often within the last 5 minutes' - - name: zookeeper - rules: - - alert: AvgRequestLatency - expr: zookeeper_avgrequestlatency > 10 - for: 10s - labels: - severity: warning - annotations: - summary: 'Zookeeper average request latency' - description: 'The average request latency is {{ $value }} on {{ $labels.pod }}' - - alert: OutstandingRequests - expr: zookeeper_outstandingrequests > 10 - for: 10s - labels: - severity: warning - annotations: - summary: 'Zookeeper outstanding requests' - description: 'There are {{ $value }} outstanding requests on {{ $labels.pod }}' - - alert: ZookeeperRunningOutOfSpace - expr: kubelet_volume_stats_available_bytes{persistentvolumeclaim=~"data-(.+)-zookeeper-[0-9]+"} < 5368709120 - for: 10s - labels: - severity: warning - annotations: - summary: 'Zookeeper is running out of free disk space' - description: 'There are only {{ $value }} bytes available at {{ $labels.persistentvolumeclaim }} PVC' - - alert: ZookeeperContainerRestartedInTheLast5Minutes - expr: count(count_over_time(container_last_seen{container="zookeeper"}[5m])) > 2 * count(container_last_seen{container="zookeeper",pod=~".+-zookeeper-[0-9]+"}) - for: 5m - labels: - severity: warning - annotations: - summary: 'One or more Zookeeper containers were restarted too often' - description: 'One or more Zookeeper containers were restarted too often within the last 5 minutes. This alert can be ignored when the Zookeeper cluster is scaling up' - - alert: ZookeeperContainersDown - expr: absent(container_last_seen{container="zookeeper",pod=~".+-zookeeper-[0-9]+"}) - for: 3m - labels: - severity: major - annotations: - summary: 'All `zookeeper` containers in the Zookeeper pods down or in CrashLookBackOff status' - description: 'All `zookeeper` containers in the Zookeeper pods have been down or in CrashLookBackOff status for 3 minutes' - name: entityOperator rules: - alert: TopicOperatorContainerDown diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/Chart.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/Chart.yaml index 50ee9ff77..25b6afc8b 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/Chart.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: 0.45.1-rc1 +appVersion: 1.2.0 description: 'Strimzi: Apache Kafka running on Kubernetes' home: https://strimzi.io/ icon: https://raw.githubusercontent.com/strimzi/strimzi-kafka-operator/main/documentation/logo/strimzi_logo.png @@ -12,16 +12,10 @@ keywords: - datastore - topic maintainers: -- name: Frawless -- name: ppatierno -- name: samuel-hawker -- name: scholzj -- name: tombentley -- name: sknot-rh -- name: PaulRMellor -- name: im-konge -- name: see-quick +- email: cncf-strimzi-maintainers@lists.cncf.io + name: Strimzi Project Maintainers + url: https://github.com/strimzi/governance name: strimzi-kafka-operator sources: - https://github.com/strimzi/strimzi-kafka-operator -version: 0.45.1-rc1 +version: 1.2.0 diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/OWNERS b/packages/system/kafka-operator/charts/strimzi-kafka-operator/OWNERS deleted file mode 100644 index 1a5c3e14d..000000000 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/OWNERS +++ /dev/null @@ -1,20 +0,0 @@ -approvers: -- ppatierno -- scholzj -- tombentley -- samuel-hawker -- Frawless -- sknot-rh -- PaulRMellor -- im-konge -- see-quick -reviewers: -- ppatierno -- scholzj -- tombentley -- samuel-hawker -- Frawless -- sknot-rh -- PaulRMellor -- im-konge -- see-quick \ No newline at end of file diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/README.md b/packages/system/kafka-operator/charts/strimzi-kafka-operator/README.md index 7036760ee..2ef5cb42b 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/README.md +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/README.md @@ -6,14 +6,19 @@ See our [website](https://strimzi.io) for more details about the project. **!!! IMPORTANT !!!** -* **Strimzi 0.45 is the last Strimzi version with support for ZooKeeper-based Apache Kafka clusters and MirrorMaker 1 deployments.** - **Please make sure to [migrate to KRaft](https://strimzi.io/docs/operators/latest/full/deploying.html#assembly-kraft-mode-str) and MirrorMaker 2 before upgrading to Strimzi 0.46 or newer.** -* Strimzi 0.45 is the last Strimzi version to include the [Strimzi EnvVar Configuration Provider](https://github.com/strimzi/kafka-env-var-config-provider) (deprecated in Strimzi 0.38.0) and [Strimzi MirrorMaker 2 Extensions](https://github.com/strimzi/mirror-maker-2-extensions) (deprecated in Strimzi 0.28.0). - Please use the Apache Kafka [EnvVarConfigProvider](https://github.com/strimzi/kafka-env-var-config-provider?tab=readme-ov-file#deprecation-notice) and [Identity Replication Policy](https://github.com/strimzi/mirror-maker-2-extensions?tab=readme-ov-file#identity-replication-policy) instead. -* From Strimzi 0.44.0 on, we support only Kubernetes 1.25 and newer. - Kubernetes 1.23 and 1.24 are not supported anymore. -* Upgrading to Strimzi 0.32 and newer directly from Strimzi 0.22 and earlier is no longer possible. - Please follow the [documentation](https://strimzi.io/docs/operators/latest/full/deploying.html#assembly-upgrade-str) for more details. +**From Strimzi 1.2.0, the Helm Chart uses the default container security context that matches the [Restricted Kubernetes Pod Security Standard](https://kubernetes.io/docs/concepts/security/pod-security-standards/).** +```yaml +securityContext: + allowPrivilegeEscalation: false + runAsNonRoot: true + readOnlyRootFilesystem: true + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault +``` +**You can override the default security context by setting the `securityContext` parameter in the Helm values.** ## Introduction @@ -40,13 +45,18 @@ cluster using the [Helm](https://helm.sh) package manager. ### Upgrading your Clusters To upgrade the Strimzi operator, you can use the `helm upgrade` command. -The `helm upgrade` command does not upgrade the [Custom Resource Definitions](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/). -Install the new CRDs manually after upgrading the Cluster Operator. +**The `helm upgrade` command does not upgrade the [Custom Resource Definitions](https://helm.sh/docs/chart_best_practices/custom_resource_definitions/).** +**Update the CRDs manually after upgrading the Cluster Operator.** You can access the CRDs from our [GitHub release page](https://github.com/strimzi/strimzi-kafka-operator/releases) or find them in the `crd` subdirectory inside the Helm Chart. +For example, when upgrading to Strimzi 0.50.0, you can do: + +```bash +kubectl apply -f https://github.com/strimzi/strimzi-kafka-operator/releases/download/0.50.0/strimzi-crds-0.50.0.yaml +``` The Strimzi Operator understands how to run and upgrade between a set of Kafka versions. When specifying a new version in your config, check to make sure you aren't using any features that may have been removed. -See [the upgrade guide](https://strimzi.io/docs/operators/latest/deploying.html#assembly-upgrading-kafka-versions-str) for more information. +See [the upgrade guide](https://strimzi.io/docs/operators/latest/deploying.html#proc-upgrade-kafka-kraft-str) for more information. ### Documentation @@ -65,14 +75,14 @@ Strimzi is licensed under the [Apache License, Version 2.0](https://github.com/s ## Prerequisites -- Kubernetes 1.25+ +- Kubernetes 1.30+ ## Installing the Chart To install the chart with the release name `my-strimzi-cluster-operator`: ```bash -$ helm install my-strimzi-cluster-operator oci://quay.io/strimzi-helm/strimzi-kafka-operator +helm install my-strimzi-cluster-operator oci://quay.io/strimzi-helm/strimzi-kafka-operator ``` The command deploys the Strimzi Cluster Operator on the Kubernetes cluster with the default configuration. @@ -83,144 +93,151 @@ The [configuration](#configuration) section lists the parameters that can be con To uninstall/delete the `my-strimzi-cluster-operator` deployment: ```bash -$ helm delete my-strimzi-cluster-operator +helm delete my-strimzi-cluster-operator ``` The command removes all the Kubernetes components associated with the operator and deletes the release. ## Configuration -The following table lists the configurable parameters of the Strimzi chart and their default values. Runtime -configuration of Kafka and other components are defined within their respective Custom Resource Definitions. See -the documentation for more details. +The following table lists the configurable parameters of the Strimzi chart and their default values. +Runtime configuration of Kafka and other components are defined within their respective Custom Resource Definitions. +See the documentation for more details. -| Parameter | Description | Default | -|---------------------------------------------|---------------------------------------------------------------------------------|------------------------------| -| `replicas` | Number of replicas of the cluster operator | 1 | -| `revisionHistoryLimit` | Number of replicaSet to keep of the operator deployment | 10 | -| `watchNamespaces` | Comma separated list of additional namespaces for the strimzi-operator to watch | [] | -| `watchAnyNamespace` | Watch the whole Kubernetes cluster (all namespaces) | `false` | -| `defaultImageRegistry` | Default image registry for all the images | `quay.io` | -| `defaultImageRepository` | Default image registry for all the images | `strimzi` | -| `defaultImageTag` | Default image tag for all the images except Kafka Bridge | `0.45.1-rc1` | -| `image.registry` | Override default Cluster Operator image registry | `nil` | -| `image.repository` | Override default Cluster Operator image repository | `nil` | -| `image.name` | Cluster Operator image name | `cluster-operator` | -| `image.tag` | Override default Cluster Operator image tag | `nil` | -| `image.digest` | Override Cluster Operator image tag with digest | `nil` | -| `image.imagePullPolicy` | Image pull policy for all pods deployed by Cluster Operator | `IfNotPresent` | -| `image.imagePullSecrets` | List of Docker registry pull secrets | `[]` | -| `fullReconciliationIntervalMs` | Full reconciliation interval in milliseconds | 120000 | -| `leaderElection.enable` | Whether to enable leader election | `true` | -| `operationTimeoutMs` | Operation timeout in milliseconds | 300000 | -| `operatorNamespaceLabels` | Labels of the namespace where the operator runs | `nil` | -| `podSecurityContext` | Cluster Operator pod's security context | `nil` | -| `priorityClassName` | Cluster Operator pod's priority class name | `nil` | -| `securityContext` | Cluster Operator container's security context | `nil` | -| `rbac.create` | Whether to create RBAC related resources | `yes` | -| `serviceAccountCreate` | Whether to create a service account | `yes` | -| `serviceAccount` | Cluster Operator's service account | `strimzi-cluster-operator` | -| `podDisruptionBudget.enabled` | Whether to enable the podDisruptionBudget feature | `false` | -| `podDisruptionBudget.minAvailable` | Default value for how many pods must be running in a cluster | `1` | -| `podDisruptionBudget.maxUnavailable` | Default value for how many pods can be down | `nil` | -| `extraEnvs` | Extra environment variables for the Cluster operator container | `[]` | -| `kafka.image.registry` | Override default Kafka image registry | `nil` | -| `kafka.image.repository` | Override default Kafka image repository | `nil` | -| `kafka.image.name` | Kafka image name | `kafka` | -| `kafka.image.tagPrefix` | Override default Kafka image tag prefix | `nil` | -| `kafka.image.tag` | Override default Kafka image tag and ignore suffix | `nil` | -| `kafka.image.digest` | Override Kafka image tag with digest | `nil` | -| `kafkaConnect.image.registry` | Override default Kafka Connect image registry | `nil` | -| `kafkaConnect.image.repository` | Override default Kafka Connect image repository | `nil` | -| `kafkaConnect.image.name` | Kafka Connect image name | `kafka` | -| `kafkaConnect.image.tagPrefix` | Override default Kafka Connect image tag prefix | `nil` | -| `kafkaConnect.image.tag` | Override default Kafka Connect image tag and ignore suffix | `nil` | -| `kafkaConnect.image.digest` | Override Kafka Connect image tag with digest | `nil` | -| `kafkaMirrorMaker.image.registry` | Override default Kafka Mirror Maker image registry | `nil` | -| `kafkaMirrorMaker.image.repository` | Override default Kafka Mirror Maker image repository | `nil` | -| `kafkaMirrorMaker.image.name` | Kafka Mirror Maker image name | `kafka` | -| `kafkaMirrorMaker.image.tagPrefix` | Override default Kafka Mirror Maker image tag prefix | `nil` | -| `kafkaMirrorMaker.image.tag` | Override default Kafka Mirror Maker image tag and ignore suffix | `nil` | -| `kafkaMirrorMaker.image.digest` | Override Kafka Mirror Maker image tag with digest | `nil` | -| `cruiseControl.image.registry` | Override default Cruise Control image registry | `nil` | -| `cruiseControl.image.repository` | Override default Cruise Control image repository | `nil` | -| `cruiseControl.image.name` | Cruise Control image name | `kafka` | -| `cruiseControl.image.tagPrefix` | Override default Cruise Control image tag prefix | `nil` | -| `cruiseControl.image.tag` | Override default Cruise Control image tag and ignore suffix | `nil` | -| `cruiseControl.image.digest` | Override Cruise Control image tag with digest | `nil` | -| `topicOperator.image.registry` | Override default Topic Operator image registry | `nil` | -| `topicOperator.image.repository` | Override default Topic Operator image repository | `nil` | -| `topicOperator.image.name` | Topic Operator image name | `operator` | -| `topicOperator.image.tag` | Override default Topic Operator image tag | `nil` | -| `topicOperator.image.digest` | Override Topic Operator image tag with digest | `nil` | -| `userOperator.image.registry` | Override default User Operator image registry | `nil` | -| `userOperator.image.repository` | Override default User Operator image repository | `nil` | -| `userOperator.image.name` | User Operator image name | `operator` | -| `userOperator.image.tag` | Override default User Operator image tag | `nil` | -| `userOperator.image.digest` | Override User Operator image tag with digest | `nil` | -| `kafkaInit.image.registry` | Override default Init Kafka image registry | `nil` | -| `kafkaInit.image.repository` | Override default Init Kafka image repository | `nil` | -| `kafkaInit.image.name` | Init Kafka image name | `operator` | -| `kafkaInit.image.tag` | Override default Init Kafka image tag | `nil` | -| `kafkaInit.image.digest` | Override Init Kafka image tag with digest | `nil` | -| `kafkaBridge.image.registry` | Override default Kafka Bridge image registry | `quay.io` | -| `kafkaBridge.image.repository` | Override default Kafka Bridge image repository | `strimzi` | -| `kafkaBridge.image.name` | Kafka Bridge image name | `kafka-bridge` | -| `kafkaBridge.image.tag` | Override default Kafka Bridge image tag | `0.31.2` | -| `kafkaBridge.image.digest` | Override Kafka Bridge image tag with digest | `nil` | -| `kafkaExporter.image.registry` | Override default Kafka Exporter image registry | `nil` | -| `kafkaExporter.image.repository` | Override default Kafka Exporter image repository | `nil` | -| `kafkaExporter.image.name` | Kafka Exporter image name | `kafka` | -| `kafkaExporter.image.tagPrefix` | Override default Kafka Exporter image tag prefix | `nil` | -| `kafkaExporter.image.tag` | Override default Kafka Exporter image tag and ignore suffix | `nil` | -| `kafkaExporter.image.digest` | Override Kafka Exporter image tag with digest | `nil` | -| `kafkaMirrorMaker2.image.registry` | Override default Kafka Mirror Maker 2 image registry | `nil` | -| `kafkaMirrorMaker2.image.repository` | Override default Kafka Mirror Maker 2 image repository | `nil` | -| `kafkaMirrorMaker2.image.name` | Kafka Mirror Maker 2 image name | `kafka` | -| `kafkaMirrorMaker2.image.tagPrefix` | Override default Kafka Mirror Maker 2 image tag prefix | `nil` | -| `kafkaMirrorMaker2.image.tag` | Override default Kafka Mirror Maker 2 image tag and ignore suffix | `nil` | -| `kafkaMirrorMaker2.image.digest` | Override Kafka Mirror Maker 2 image tag with digest | `nil` | -| `kanikoExecutor.image.registry` | Override default Kaniko Executor image registry | `nil` | -| `kanikoExecutor.image.repository` | Override default Kaniko Executor image repository | `nil` | -| `kanikoExecutor.image.name` | Kaniko Executor image name | `kaniko-executor` | -| `kanikoExecutor.image.tag` | Override default Kaniko Executor image tag | `nil` | -| `kanikoExecutor.image.digest` | Override Kaniko Executor image tag with digest | `nil` | -| `resources.limits.memory` | Memory constraint for limits | `384Mi` | -| `resources.limits.cpu` | CPU constraint for limits | `1000m` | -| `resources.requests.memory` | Memory constraint for requests | `384Mi` | -| `livenessProbe.initialDelaySeconds` | Liveness probe initial delay in seconds | 10 | -| `livenessProbe.periodSeconds` | Liveness probe period in seconds | 30 | -| `readinessProbe.initialDelaySeconds` | Readiness probe initial delay in seconds | 10 | -| `readinessProbe.periodSeconds` | Readiness probe period in seconds | 30 | -| `imageTagOverride` | Override all image tag config | `nil` | -| `createGlobalResources` | Allow creation of cluster-scoped resources | `true` | -| `createAggregateRoles` | Create cluster roles that extend aggregated roles to use Strimzi CRDs | `false` | -| `tolerations` | Add tolerations to Operator Pod | `[]` | -| `affinity` | Add affinities to Operator Pod | `{}` | -| `annotations` | Add annotations to Operator Pod | `{}` | -| `labels` | Add labels to Operator Pod | `{}` | -| `nodeSelector` | Add a node selector to Operator Pod | `{}` | -| `featureGates` | Feature Gates configuration | `nil` | -| `tmpDirSizeLimit` | Set the `sizeLimit` for the tmp dir volume used by the operator | `1Mi` | -| `labelsExclusionPattern` | Override the exclude pattern for exclude some labels | `""` | -| `generateNetworkPolicy` | Controls whether Strimzi generates network policy resources | `true` | -| `connectBuildTimeoutMs` | Overrides the default timeout value for building new Kafka Connect | `300000` | -| `mavenBuilder.image.registry` | Override default Maven Builder image registry | `nil` | -| `mavenBuilder.image.repository` | Maven Builder image repository | `nil` | -| `mavenBuilder.image.name` | Override default Maven Builder image name | `maven-builder` | -| `mavenBuilder.image.tag` | Override default Maven Builder image tag | `nil` | -| `mavenBuilder.image.digest` | Override Maven Builder image tag with digest | `nil` | -| `logConfiguration` | Override default `log4j.properties` content | `nil` | -| `logLevel` | Override default logging level | `INFO` | -| `dashboards.enable` | Generate configmaps containing the dashboards | `false` | -| `dashboards.label` | How should the dashboards be labeled for the sidecar | `grafana_dashboard` | -| `dashboards.labelValue` | What should the dashboards label value be for the sidecar | `"1"` | -| `dashboards.extraLabels` | Any additional labels you would like on the dashboards | `{}` | -| `dashboards.namespace` | What namespace should the dashboards be loaded into | `Follows toplevel Namespace` | -| `dashboards.annotations` | Any custom annotations (such as folder for the sidecar) | `{}` | +| Parameter | Description | Default | +|--------------------------------------------------|---------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------| +| `replicas` | Number of replicas of the cluster operator | 1 | +| `revisionHistoryLimit` | Number of replicaSet to keep of the operator deployment | 10 | +| `watchNamespaces` | Comma separated list of additional namespaces for the strimzi-operator to watch | [] | +| `watchAnyNamespace` | Watch the whole Kubernetes cluster (all namespaces) | `false` | +| `defaultImageRegistry` | Default image registry for all the images | `quay.io` | +| `defaultImageRepository` | Default image registry for all the images | `strimzi` | +| `defaultImageTag` | Default image tag for all the images except Kafka Bridge | `1.2.0` | +| `deploymentAnnotations` | Annotations for the operator deployment | `{}` | +| `deploymentLabels` | Labels for the operator deployment | `{}` | +| `image.registry` | Override default Cluster Operator image registry | `nil` | +| `image.repository` | Override default Cluster Operator image repository | `nil` | +| `image.name` | Cluster Operator image name | `operator` | +| `image.tag` | Override default Cluster Operator image tag | `nil` | +| `image.digest` | Override Cluster Operator image tag with digest | `nil` | +| `image.imagePullPolicy` | Image pull policy for all pods deployed by Cluster Operator | `IfNotPresent` | +| `image.imagePullSecrets` | List of Docker registry pull secrets | `[]` | +| `fullReconciliationIntervalMs` | Full reconciliation interval in milliseconds | 120000 | +| `leaderElection.enable` | Whether to enable leader election | `true` | +| `operationTimeoutMs` | Operation timeout in milliseconds | 300000 | +| `operatorNamespaceLabels` | Labels of the namespace where the operator runs | `nil` | +| `podSecurityContext` | Cluster Operator pod's security context | `nil` | +| `deploymentStrategy` | Adjust the Kubernetes rollout strategy of the Cluster Operator Deployment | `nil` | +| `priorityClassName` | Cluster Operator pod's priority class name | `nil` | +| `hostUsers` | Set hostUsers value on the Cluster Operator container | `nil` | +| `enableServiceLinks` | Set enableServiceLinks value on the Cluster Operator pod | `nil` | +| `securityContext` | Cluster Operator container's security context | [Restricted Kubernetes Pod Security Standard](https://kubernetes.io/docs/concepts/security/pod-security-standards/) | +| `rbac.create` | Whether to create RBAC related resources | `yes` | +| `serviceAccountCreate` | Whether to create a service account | `yes` | +| `serviceAccount` | Cluster Operator's service account | `strimzi-cluster-operator` | +| `podDisruptionBudget.enabled` | Whether to enable the podDisruptionBudget feature | `false` | +| `podDisruptionBudget.minAvailable` | Default value for how many pods must be running in a cluster | `1` | +| `podDisruptionBudget.maxUnavailable` | Default value for how many pods can be down | `nil` | +| `podDisruptionBudget.unhealthyPodEvictionPolicy` | Default value for how to respond to unheathly pods | `IfHealthyBudget` | +| `extraEnvs` | Extra environment variables for the Cluster operator container | `[]` | +| `kafka.image.registry` | Override default Kafka image registry | `nil` | +| `kafka.image.repository` | Override default Kafka image repository | `nil` | +| `kafka.image.name` | Kafka image name | `kafka` | +| `kafka.image.tagPrefix` | Override default Kafka image tag prefix | `nil` | +| `kafka.image.tag` | Override default Kafka image tag and ignore suffix | `nil` | +| `kafka.image.digest` | Override Kafka image tag with digest | `nil` | +| `kafkaConnect.image.registry` | Override default Kafka Connect image registry | `nil` | +| `kafkaConnect.image.repository` | Override default Kafka Connect image repository | `nil` | +| `kafkaConnect.image.name` | Kafka Connect image name | `kafka` | +| `kafkaConnect.image.tagPrefix` | Override default Kafka Connect image tag prefix | `nil` | +| `kafkaConnect.image.tag` | Override default Kafka Connect image tag and ignore suffix | `nil` | +| `kafkaConnect.image.digest` | Override Kafka Connect image tag with digest | `nil` | +| `cruiseControl.image.registry` | Override default Cruise Control image registry | `nil` | +| `cruiseControl.image.repository` | Override default Cruise Control image repository | `nil` | +| `cruiseControl.image.name` | Cruise Control image name | `kafka` | +| `cruiseControl.image.tagPrefix` | Override default Cruise Control image tag prefix | `nil` | +| `cruiseControl.image.tag` | Override default Cruise Control image tag and ignore suffix | `nil` | +| `cruiseControl.image.digest` | Override Cruise Control image tag with digest | `nil` | +| `topicOperator.image.registry` | Override default Topic Operator image registry | `nil` | +| `topicOperator.image.repository` | Override default Topic Operator image repository | `nil` | +| `topicOperator.image.name` | Topic Operator image name | `operator` | +| `topicOperator.image.tag` | Override default Topic Operator image tag | `nil` | +| `topicOperator.image.digest` | Override Topic Operator image tag with digest | `nil` | +| `userOperator.image.registry` | Override default User Operator image registry | `nil` | +| `userOperator.image.repository` | Override default User Operator image repository | `nil` | +| `userOperator.image.name` | User Operator image name | `operator` | +| `userOperator.image.tag` | Override default User Operator image tag | `nil` | +| `userOperator.image.digest` | Override User Operator image tag with digest | `nil` | +| `kafkaInit.image.registry` | Override default Init Kafka image registry | `nil` | +| `kafkaInit.image.repository` | Override default Init Kafka image repository | `nil` | +| `kafkaInit.image.name` | Init Kafka image name | `operator` | +| `kafkaInit.image.tag` | Override default Init Kafka image tag | `nil` | +| `kafkaInit.image.digest` | Override Init Kafka image tag with digest | `nil` | +| `kafkaBridge.image.registry` | Override default Kafka Bridge image registry | `quay.io` | +| `kafkaBridge.image.repository` | Override default Kafka Bridge image repository | `strimzi` | +| `kafkaBridge.image.name` | Kafka Bridge image name | `kafka-bridge` | +| `kafkaBridge.image.tag` | Override default Kafka Bridge image tag | `1.1.0` | +| `kafkaBridge.image.digest` | Override Kafka Bridge image tag with digest | `nil` | +| `kafkaExporter.image.registry` | Override default Kafka Exporter image registry | `nil` | +| `kafkaExporter.image.repository` | Override default Kafka Exporter image repository | `nil` | +| `kafkaExporter.image.name` | Kafka Exporter image name | `kafka` | +| `kafkaExporter.image.tagPrefix` | Override default Kafka Exporter image tag prefix | `nil` | +| `kafkaExporter.image.tag` | Override default Kafka Exporter image tag and ignore suffix | `nil` | +| `kafkaExporter.image.digest` | Override Kafka Exporter image tag with digest | `nil` | +| `kafkaMirrorMaker2.image.registry` | Override default Kafka Mirror Maker 2 image registry | `nil` | +| `kafkaMirrorMaker2.image.repository` | Override default Kafka Mirror Maker 2 image repository | `nil` | +| `kafkaMirrorMaker2.image.name` | Kafka Mirror Maker 2 image name | `kafka` | +| `kafkaMirrorMaker2.image.tagPrefix` | Override default Kafka Mirror Maker 2 image tag prefix | `nil` | +| `kafkaMirrorMaker2.image.tag` | Override default Kafka Mirror Maker 2 image tag and ignore suffix | `nil` | +| `kafkaMirrorMaker2.image.digest` | Override Kafka Mirror Maker 2 image tag with digest | `nil` | +| `kanikoExecutor.image.registry` | Override default Kaniko Executor image registry | `nil` | +| `kanikoExecutor.image.repository` | Override default Kaniko Executor image repository | `nil` | +| `kanikoExecutor.image.name` | Kaniko Executor image name | `kaniko-executor` | +| `kanikoExecutor.image.tag` | Override default Kaniko Executor image tag | `nil` | +| `kanikoExecutor.image.digest` | Override Kaniko Executor image tag with digest | `nil` | +| `buildah.image.registry` | Override default Buildah image registry | `nil` | +| `buildah.image.repository` | Override default Buildah image repository | `nil` | +| `buildah.image.name` | Buildah image name | `buildah` | +| `buildah.image.tag` | Override default Buildah image tag | `nil` | +| `buildah.image.digest` | Override Buildah image tag with digest | `nil` | +| `resources.limits.memory` | Memory constraint for limits | `384Mi` | +| `resources.limits.cpu` | CPU constraint for limits | `1000m` | +| `resources.requests.memory` | Memory constraint for requests | `384Mi` | +| `livenessProbe.initialDelaySeconds` | Liveness probe initial delay in seconds | 10 | +| `livenessProbe.periodSeconds` | Liveness probe period in seconds | 30 | +| `readinessProbe.initialDelaySeconds` | Readiness probe initial delay in seconds | 10 | +| `readinessProbe.periodSeconds` | Readiness probe period in seconds | 30 | +| `imageTagOverride` | Override all image tag config | `nil` | +| `createGlobalResources` | Allow creation of cluster-scoped resources | `true` | +| `createAggregateRoles` | Create cluster roles that extend aggregated roles to use Strimzi CRDs | `false` | +| `tolerations` | Add tolerations to Operator Pod | `[]` | +| `topologySpreadConstraints` | Add topology spread constraints to Operator Pod | `[]` | +| `affinity` | Add affinities to Operator Pod | `{}` | +| `annotations` | Add annotations to Operator Pod | `{}` | +| `labels` | Add labels to Operator Pod | `{}` | +| `nodeSelector` | Add a node selector to Operator Pod | `{}` | +| `featureGates` | Feature Gates configuration | `nil` | +| `tmpDirSizeLimit` | Set the `sizeLimit` for the tmp dir volume used by the operator | `1Mi` | +| `labelsExclusionPattern` | Override the exclude pattern for exclude some labels | `""` | +| `operatorNetworkPolicy.enabled` | Generate a networkPolicy for the strimzi-operator (operator not Kafka) | `false` | +| `generateNetworkPolicy` | Controls whether Strimzi generates network policy resources | `true` | +| `connectBuildTimeoutMs` | Overrides the default timeout value for building new Kafka Connect | `300000` | +| `mavenBuilder.image.registry` | Override default Maven Builder image registry | `nil` | +| `mavenBuilder.image.repository` | Maven Builder image repository | `nil` | +| `mavenBuilder.image.name` | Override default Maven Builder image name | `maven-builder` | +| `mavenBuilder.image.tag` | Override default Maven Builder image tag | `nil` | +| `mavenBuilder.image.digest` | Override Maven Builder image tag with digest | `nil` | +| `logConfiguration` | Override default `log4j.properties` content | `nil` | +| `logLevel` | Override default logging level | `INFO` | +| `dashboards.enabled` | Generate configmaps containing the dashboards | `false` | +| `dashboards.label` | How should the dashboards be labeled for the sidecar | `grafana_dashboard` | +| `dashboards.labelValue` | What should the dashboards label value be for the sidecar | `"1"` | +| `dashboards.extraLabels` | Any additional labels you would like on the dashboards | `{}` | +| `dashboards.namespace` | What namespace should the dashboards be loaded into | `Follows toplevel Namespace` | +| `dashboards.annotations` | Any custom annotations (such as folder for the sidecar) | `{}` | Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, ```bash -$ helm install my-strimzi-cluster-operator --set replicas=2 oci://quay.io/strimzi-helm/strimzi-kafka-operator +helm install my-strimzi-cluster-operator --set replicas=2 oci://quay.io/strimzi-helm/strimzi-kafka-operator ``` diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/040-Crd-kafka.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/040-Crd-kafka.yaml index 8e5ca8570..c2edb2f9a 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/040-Crd-kafka.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/040-Crd-kafka.yaml @@ -21,32 +21,28 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: status: {} additionalPrinterColumns: - - name: Desired Kafka replicas - description: The desired number of Kafka replicas in the cluster - jsonPath: .spec.kafka.replicas - type: integer - - name: Desired ZK replicas - description: The desired number of ZooKeeper replicas in the cluster - jsonPath: .spec.zookeeper.replicas - type: integer - name: Ready description: The state of the custom resource jsonPath: ".status.conditions[?(@.type==\"Ready\")].status" type: string - - name: Metadata State - description: The state of the cluster metadata - jsonPath: .status.kafkaMetadataState - type: string - name: Warnings description: Warnings related to the custom resource jsonPath: ".status.conditions[?(@.type==\"Warning\")].status" type: string + - name: Kafka version + description: The Kafka version used by the cluster + jsonPath: .status.kafkaVersion + type: string + - name: Metadata version + description: The Kafka metadata version used by the cluster + jsonPath: .status.kafkaMetadataVersion + type: string schema: openAPIV3Schema: type: object @@ -71,10 +67,6 @@ spec: metadataVersion: type: string description: "The KRaft metadata version used by the Kafka cluster. This property is ignored when running in ZooKeeper mode. If the property is not set, it defaults to the metadata version that corresponds to the `version` property." - replicas: - type: integer - minimum: 1 - description: The number of pods in the cluster. This property is required when node pools are not used. image: type: string description: "The container image used for Kafka pods. If the property is not set, the default Kafka image version is determined based on the `version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration. Changing the Kafka image version does not automatically update the image versions for other components, such as Kafka Exporter. " @@ -97,200 +89,32 @@ spec: enum: - internal - route + - tlsroute - loadbalancer - nodeport - ingress - cluster-ip - description: "Type of the listener. The supported types are as follows: \n\n* `internal` type exposes Kafka internally only within the Kubernetes cluster.\n* `route` type uses OpenShift Routes to expose Kafka.\n* `loadbalancer` type uses LoadBalancer type services to expose Kafka.\n* `nodeport` type uses NodePort type services to expose Kafka.\n* `ingress` type uses Kubernetes Nginx Ingress to expose Kafka with TLS passthrough.\n* `cluster-ip` type uses a per-broker `ClusterIP` service.\n" + description: "Type of the listener. The supported types are as follows: \n\n* `internal` type exposes Kafka internally only within the Kubernetes cluster.\n* `route` type uses OpenShift Routes to expose Kafka.\n* `loadbalancer` type uses LoadBalancer type services to expose Kafka.\n* `nodeport` type uses NodePort type services to expose Kafka.\n* `ingress` (deprecated) type uses Kubernetes Nginx Ingress to expose Kafka with TLS passthrough.\n* `cluster-ip` type uses a per-broker `ClusterIP` service.\n" tls: type: boolean description: "Enables TLS encryption on the listener. This is a required property. For `route` and `ingress` type listeners, TLS encryption must be always enabled." authentication: type: object properties: - accessTokenIsJwt: - type: boolean - description: Configure whether the access token is treated as JWT. This must be set to `false` if the authorization server returns opaque tokens. Defaults to `true`. - checkAccessTokenType: - type: boolean - description: Configure whether the access token type check is performed or not. This should be set to `false` if the authorization server does not include 'typ' claim in JWT token. Defaults to `true`. - checkAudience: - type: boolean - description: "Enable or disable audience checking. Audience checks identify the recipients of tokens. If audience checking is enabled, the OAuth Client ID also has to be configured using the `clientId` property. The Kafka broker will reject tokens that do not have its `clientId` in their `aud` (audience) claim.Default value is `false`." - checkIssuer: - type: boolean - description: Enable or disable issuer checking. By default issuer is checked using the value configured by `validIssuerUri`. Default value is `true`. - clientAudience: - type: string - description: The audience to use when making requests to the authorization server's token endpoint. Used for inter-broker authentication and for configuring OAuth 2.0 over PLAIN using the `clientId` and `secret` method. - clientId: - type: string - description: OAuth Client ID which the Kafka broker can use to authenticate against the authorization server and use the introspect endpoint URI. - clientScope: - type: string - description: The scope to use when making requests to the authorization server's token endpoint. Used for inter-broker authentication and for configuring OAuth 2.0 over PLAIN using the `clientId` and `secret` method. - clientSecret: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the OAuth client secret which the Kafka broker can use to authenticate against the authorization server and use the introspect endpoint URI. - connectTimeoutSeconds: - type: integer - description: "The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds." - customClaimCheck: - type: string - description: JsonPath filter query to be applied to the JWT token or to the response of the introspection endpoint for additional token validation. Not set by default. - disableTlsHostnameVerification: - type: boolean - description: Enable or disable TLS hostname verification. Default value is `false`. - enableECDSA: - type: boolean - description: Enable or disable ECDSA support by installing BouncyCastle crypto provider. ECDSA support is always enabled. The BouncyCastle libraries are no longer packaged with Strimzi. Value is ignored. - enableMetrics: - type: boolean - description: Enable or disable OAuth metrics. Default value is `false`. - enableOauthBearer: - type: boolean - description: Enable or disable OAuth authentication over SASL_OAUTHBEARER. Default value is `true`. - enablePlain: - type: boolean - description: Enable or disable OAuth authentication over SASL_PLAIN. There is no re-authentication support when this mechanism is used. Default value is `false`. - failFast: - type: boolean - description: Enable or disable termination of Kafka broker processes due to potentially recoverable runtime errors during startup. Default value is `true`. - fallbackUserNameClaim: - type: string - description: The fallback username claim to be used for the user ID if the claim specified by `userNameClaim` is not present. This is useful when `client_credentials` authentication only results in the client ID being provided in another claim. It only takes effect if `userNameClaim` is set. - fallbackUserNamePrefix: - type: string - description: "The prefix to use with the value of `fallbackUserNameClaim` to construct the user id. This only takes effect if `fallbackUserNameClaim` is true, and the value is present for the claim. Mapping usernames and client ids into the same user id space is useful in preventing name collisions." - groupsClaim: - type: string - description: JsonPath query used to extract groups for the user during authentication. Extracted groups can be used by a custom authorizer. By default no groups are extracted. - groupsClaimDelimiter: - type: string - description: "A delimiter used to parse groups when they are extracted as a single String value rather than a JSON array. Default value is ',' (comma)." - httpRetries: - type: integer - description: "The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries." - httpRetryPauseMs: - type: integer - description: "The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request." - includeAcceptHeader: - type: boolean - description: Whether the Accept header should be set in requests to the authorization servers. The default value is `true`. - introspectionEndpointUri: - type: string - description: URI of the token introspection endpoint which can be used to validate opaque non-JWT tokens. - jwksEndpointUri: - type: string - description: "URI of the JWKS certificate endpoint, which can be used for local JWT validation." - jwksExpirySeconds: - type: integer - minimum: 1 - description: Configures how often are the JWKS certificates considered valid. The expiry interval has to be at least 60 seconds longer then the refresh interval specified in `jwksRefreshSeconds`. Defaults to 360 seconds. - jwksIgnoreKeyUse: - type: boolean - description: Flag to ignore the 'use' attribute of `key` declarations in a JWKS endpoint response. Default value is `false`. - jwksMinRefreshPauseSeconds: - type: integer - minimum: 0 - description: "The minimum pause between two consecutive refreshes. When an unknown signing key is encountered the refresh is scheduled immediately, but will always wait for this minimum pause. Defaults to 1 second." - jwksRefreshSeconds: - type: integer - minimum: 1 - description: Configures how often are the JWKS certificates refreshed. The refresh interval has to be at least 60 seconds shorter then the expiry interval specified in `jwksExpirySeconds`. Defaults to 300 seconds. listenerConfig: x-kubernetes-preserve-unknown-fields: true type: object description: Configuration to be used for a specific listener. All values are prefixed with `listener.name.`. - maxSecondsWithoutReauthentication: - type: integer - description: "Maximum number of seconds the authenticated session remains valid without re-authentication. This enables Apache Kafka re-authentication feature, and causes sessions to expire when the access token expires. If the access token expires before max time or if max time is reached, the client has to re-authenticate, otherwise the server will drop the connection. Not set by default - the authenticated session does not expire when the access token expires. This option only applies to SASL_OAUTHBEARER authentication mechanism (when `enableOauthBearer` is `true`)." - readTimeoutSeconds: - type: integer - description: "The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds." sasl: type: boolean description: Enable or disable SASL on this listener. - secrets: - type: array - items: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Secrets to be mounted to `/opt/kafka/custom-authn-secrets/custom-listener--/`. - serverBearerTokenLocation: - type: string - description: Path to the file on the local filesystem that contains a bearer token to be used instead of client ID and secret when authenticating to authorization server. - tlsTrustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection to the OAuth server. - tokenEndpointUri: - type: string - description: "URI of the Token Endpoint to use with SASL_PLAIN mechanism when the client authenticates with `clientId` and a `secret`. If set, the client can authenticate over SASL_PLAIN by either setting `username` to `clientId`, and setting `password` to client `secret`, or by setting `username` to account username, and `password` to access token prefixed with `$accessToken:`. If this option is not set, the `password` is always interpreted as an access token (without a prefix), and `username` as the account username (a so called 'no-client-credentials' mode)." type: type: string enum: - tls - scram-sha-512 - - oauth - custom - description: Authentication type. `oauth` type uses SASL OAUTHBEARER Authentication. `scram-sha-512` type uses SASL SCRAM-SHA-512 Authentication. `tls` type uses TLS Client Authentication. `tls` type is supported only on TLS listeners.`custom` type allows for any authentication type to be used. - userInfoEndpointUri: - type: string - description: 'URI of the User Info Endpoint to use as a fallback to obtaining the user id when the Introspection Endpoint does not return information that can be used for the user id. ' - userNameClaim: - type: string - description: "Name of the claim from the JWT authentication token, Introspection Endpoint response or User Info Endpoint response which will be used to extract the user id. Defaults to `sub`." - userNamePrefix: - type: string - description: "The prefix to use with the value of `userNameClaim` to construct the user ID. This only takes effect if `userNameClaim` is specified and the value is present for the claim. When used in combination with `fallbackUserNameClaims`, it ensures consistent mapping of usernames and client IDs into the same user ID space and prevents name collisions." - validIssuerUri: - type: string - description: URI of the token issuer used for authentication. - validTokenType: - type: string - description: "Valid value for the `token_type` attribute returned by the Introspection Endpoint. No default value, and not checked by default." + description: Authentication type. `scram-sha-512` type uses SASL SCRAM-SHA-512 Authentication. `tls` type uses TLS Client Authentication. `tls` type is supported only on TLS listeners. `custom` type allows for any authentication type to be used. required: - type description: Authentication configuration for this listener. @@ -308,7 +132,7 @@ spec: description: The name of the file certificate in the Secret. key: type: string - description: The name of the private key in the Secret. + description: "The name of the private key in the secret. The private key must be in unencrypted PKCS #8 format. For more information, see RFC 5208: https://datatracker.ietf.org/doc/html/rfc5208." required: - secretName - certificate @@ -476,22 +300,56 @@ spec: * `InternalIP` * `Hostname` - This property is used to select the preferred address type, which is checked first. If no address is found for this address type, the other types are checked in the default order.For `nodeport` listeners only. + This property is used to select the preferred address type, which is checked first. If no address is found for this address type, the other types are checked in the default order. For `nodeport` listeners only. publishNotReadyAddresses: type: boolean description: Configures whether the service endpoints are considered "ready" even if the Pods themselves are not. Defaults to `false`. This field can not be used with `internal` listeners. + perBrokerAnnotationsTemplate: + additionalProperties: + type: string + type: object + description: "Configures the template used to generate annotations for individual brokers. You can use the `{nodeId}` and `{nodePodName}` placeholders in annotation values. Templating applies only to annotation values." + perBrokerLabelsTemplate: + additionalProperties: + type: string + type: object + description: "Configures the template used to generate labels for individual brokers. You can use the `{nodeId}` and `{nodePodName}` placeholders in label values. Templating applies only to label values." hostTemplate: type: string description: "Configures the template for generating the hostnames of the individual brokers. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." advertisedHostTemplate: type: string description: "Configures the template for generating the advertised hostnames of the individual brokers. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + advertisedPortTemplate: + type: string + description: "Configures the template for generating the advertised ports of the individual brokers. It allows to specify a simple mathematics formula that will be used to calculate the port. The only valid placeholder that you can use in the template is `{nodeId}`. Supported operations are `+`, `-`, and `*`. For example, `9000 + {nodeId}` will generate ports `9000`, `9001`, `9002`, and so on for the individual brokers. You can also use a fixed port number in the template, for example `9000`, which will generate the same port for all brokers." allocateLoadBalancerNodePorts: type: boolean description: |- Configures whether to allocate NodePort automatically for the `Service` with type `LoadBalancer`. This is a one to one with the `spec.allocateLoadBalancerNodePorts` configuration in the `Service` type For `loadbalancer` listeners only. + parentRefs: + type: array + items: + type: object + properties: + kind: + type: string + group: + type: string + name: + type: string + namespace: + type: string + port: + type: integer + sectionName: + type: string + description: |- + For `tlsroute` listeners only. + Configures the Gateway API resource or resources that generated `TLSRoute` resources attach to. + Typically, this is a `Gateway` resource. description: Additional listener configuration. networkPolicyPeers: type: array @@ -557,176 +415,13 @@ spec: config: x-kubernetes-preserve-unknown-fields: true type: object - description: "Kafka broker config properties with the following prefixes cannot be set: listeners, advertised., broker., listener., host.name, port, inter.broker.listener.name, sasl., ssl., security., password., log.dir, zookeeper.connect, zookeeper.set.acl, zookeeper.ssl, zookeeper.clientCnxnSocket, authorizer., super.user, cruise.control.metrics.topic, cruise.control.metrics.reporter.bootstrap.servers, node.id, process.roles, controller., metadata.log.dir, zookeeper.metadata.migration.enable, client.quota.callback.static.kafka.admin., client.quota.callback.static.produce, client.quota.callback.static.fetch, client.quota.callback.static.storage.per.volume.limit.min.available., client.quota.callback.static.excluded.principal.name.list (with the exception of: zookeeper.connection.timeout.ms, sasl.server.max.receive.size, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols, ssl.secure.random.implementation, cruise.control.metrics.topic.num.partitions, cruise.control.metrics.topic.replication.factor, cruise.control.metrics.topic.retention.ms, cruise.control.metrics.topic.auto.create.retries, cruise.control.metrics.topic.auto.create.timeout.ms, cruise.control.metrics.topic.min.insync.replicas, controller.quorum.election.backoff.max.ms, controller.quorum.election.timeout.ms, controller.quorum.fetch.timeout.ms)." - storage: - type: object - properties: - class: - type: string - description: The storage class to use for dynamic volume allocation. - deleteClaim: - type: boolean - description: Specifies if the persistent volume claim has to be deleted when the cluster is un-deployed. - id: - type: integer - minimum: 0 - description: Storage identification number. It is mandatory only for storage volumes defined in a storage of type 'jbod'. - kraftMetadata: - type: string - enum: - - shared - description: "Specifies whether this volume should be used for storing KRaft metadata. This property is optional. When set, the only currently supported value is `shared`. At most one volume can have this property set." - overrides: - type: array - items: - type: object - properties: - class: - type: string - description: The storage class to use for dynamic volume allocation for this broker. - broker: - type: integer - description: Id of the kafka broker (broker identifier). - description: Overrides for individual brokers. The `overrides` field allows you to specify a different configuration for different brokers. - selector: - additionalProperties: - type: string - type: object - description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume. - size: - type: string - description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`." - sizeLimit: - type: string - pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" - description: "When type=ephemeral, defines the total amount of local storage required for this EmptyDir volume (for example 1Gi)." - type: - type: string - enum: - - ephemeral - - persistent-claim - - jbod - description: "Storage type, must be either 'ephemeral', 'persistent-claim', or 'jbod'." - volumes: - type: array - items: - type: object - properties: - class: - type: string - description: The storage class to use for dynamic volume allocation. - deleteClaim: - type: boolean - description: Specifies if the persistent volume claim has to be deleted when the cluster is un-deployed. - id: - type: integer - minimum: 0 - description: Storage identification number. Mandatory for storage volumes defined with a `jbod` storage type configuration. - kraftMetadata: - type: string - enum: - - shared - description: "Specifies whether this volume should be used for storing KRaft metadata. This property is optional. When set, the only currently supported value is `shared`. At most one volume can have this property set." - overrides: - type: array - items: - type: object - properties: - class: - type: string - description: The storage class to use for dynamic volume allocation for this broker. - broker: - type: integer - description: Id of the kafka broker (broker identifier). - description: Overrides for individual brokers. The `overrides` field allows you to specify a different configuration for different brokers. - selector: - additionalProperties: - type: string - type: object - description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume. - size: - type: string - description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`." - sizeLimit: - type: string - pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" - description: "When type=ephemeral, defines the total amount of local storage required for this EmptyDir volume (for example 1Gi)." - type: - type: string - enum: - - ephemeral - - persistent-claim - description: "Storage type, must be either 'ephemeral' or 'persistent-claim'." - required: - - type - description: List of volumes as Storage objects representing the JBOD disks array. - required: - - type - description: Storage configuration (disk). Cannot be updated. This property is required when node pools are not used. + description: Kafka broker config properties with certain prefixes cannot be set unless it is in the exception list. Consult the documentation for the list of forbidden prefixes and exceptions. authorization: type: object properties: - allowOnError: - type: boolean - description: "Defines whether a Kafka client should be allowed or denied by default when the authorizer fails to query the Open Policy Agent, for example, when it is temporarily unavailable). Defaults to `false` - all actions will be denied." authorizerClass: type: string description: "Authorization implementation class, which must be available in classpath." - clientId: - type: string - description: OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - connectTimeoutSeconds: - type: integer - minimum: 1 - description: "The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds." - delegateToKafkaAcls: - type: boolean - description: Whether authorization decision should be delegated to the 'Simple' authorizer if DENIED by Keycloak Authorization Services policies. Default value is `false`. - disableTlsHostnameVerification: - type: boolean - description: Enable or disable TLS hostname verification. Default value is `false`. - enableMetrics: - type: boolean - description: Enable or disable OAuth metrics. The default value is `false`. - expireAfterMs: - type: integer - description: The expiration of the records kept in the local cache to avoid querying the Open Policy Agent for every request. Defines how often the cached authorization decisions are reloaded from the Open Policy Agent server. In milliseconds. Defaults to `3600000`. - grantsAlwaysLatest: - type: boolean - description: "Controls whether the latest grants are fetched for a new session. When enabled, grants are retrieved from Keycloak and cached for the user. The default value is `false`." - grantsGcPeriodSeconds: - type: integer - minimum: 1 - description: "The time, in seconds, between consecutive runs of a job that cleans stale grants from the cache. The default value is 300." - grantsMaxIdleTimeSeconds: - type: integer - minimum: 1 - description: "The time, in seconds, after which an idle grant can be evicted from the cache. The default value is 300." - grantsRefreshPeriodSeconds: - type: integer - minimum: 0 - description: The time between two consecutive grants refresh runs in seconds. The default value is 60. - grantsRefreshPoolSize: - type: integer - minimum: 1 - description: "The number of threads to use to refresh grants for active sessions. The more threads, the more parallelism, so the sooner the job completes. However, using more threads places a heavier load on the authorization server. The default value is 5." - httpRetries: - type: integer - minimum: 0 - description: "The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries." - includeAcceptHeader: - type: boolean - description: Whether the Accept header should be set in requests to the authorization servers. The default value is `true`. - initialCacheCapacity: - type: integer - description: Initial capacity of the local cache used by the authorizer to avoid querying the Open Policy Agent for every request Defaults to `5000`. - maximumCacheSize: - type: integer - description: Maximum capacity of the local cache used by the authorizer to avoid querying the Open Policy Agent for every request. Defaults to `50000`. - readTimeoutSeconds: - type: integer - minimum: 1 - description: "The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds." superUsers: type: array items: @@ -735,60 +430,37 @@ spec: supportsAdminApi: type: boolean description: Indicates whether the custom authorizer supports the APIs for managing ACLs using the Kafka Admin API. Defaults to `false`. - tlsTrustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection to the OAuth server. - tokenEndpointUri: - type: string - description: Authorization server token endpoint URI. type: type: string enum: - simple - - opa - - keycloak - custom - description: "Authorization type. Currently, the supported types are `simple`, `keycloak`, `opa` and `custom`. `simple` authorization type uses Kafka's built-in authorizer for authorization. `keycloak` authorization type uses Keycloak Authorization Services for authorization. `opa` authorization type uses Open Policy Agent based authorization.`custom` authorization type uses user-provided implementation for authorization." - url: - type: string - example: http://opa:8181/v1/data/kafka/authz/allow - description: The URL used to connect to the Open Policy Agent server. The URL has to include the policy which will be queried by the authorizer. This option is required. + description: "Authorization type. Currently, the supported types are `simple` and `custom`. `simple` authorization type uses Kafka's built-in authorizer for authorization. `custom` authorization type uses user-provided implementation for authorization." required: - type description: Authorization configuration for Kafka brokers. rack: type: object properties: + envVarName: + type: string + description: The name of the environment variable that defines the rack ID. Its value sets the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect or MirrorMaker 2. topologyKey: type: string example: topology.kubernetes.io/zone description: "A key that matches labels assigned to the Kubernetes cluster nodes. The value of the label is used to set a broker's `broker.rack` config, and the `client.rack` config for Kafka Connect or MirrorMaker 2." - required: - - topologyKey + type: + type: string + enum: + - topology-label + - environment-variable + description: "Specifies the rack awareness type. Supported types are `topology-label` and `environment-variable`. `topology-label` uses a Kubernetes worker node label to set the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect and MirrorMaker 2. `environment-variable` uses an environment variable to set the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect and MirrorMaker 2. When not specified, `topology-label` type is used by default." description: Configuration of the `broker.rack` broker config. + x-kubernetes-validations: + - rule: (has(self.type) && self.type != "topology-label") || self.topologyKey != "" + message: topologyKey property is required + - rule: has(self.type) == false || self.type != "environment-variable" || self.envVarName != "" + message: envVarName property is required brokerRackInitImage: type: string description: The image of the init container used for initializing the `broker.rack`. @@ -887,35 +559,6 @@ spec: - type description: Authentication configuration for connecting to the JMX port. description: JMX Options for Kafka brokers. - resources: - type: object - properties: - claims: - type: array - items: - type: object - properties: - name: - type: string - request: - type: string - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - description: CPU and memory resources to reserve. metricsConfig: type: object properties: @@ -923,7 +566,8 @@ spec: type: string enum: - jmxPrometheusExporter - description: Metrics type. Only 'jmxPrometheusExporter' supported currently. + - strimziMetricsReporter + description: Metrics type. The supported types are `jmxPrometheusExporter` and `strimziMetricsReporter`. Type `jmxPrometheusExporter` uses the Prometheus JMX Exporter to expose Kafka JMX metrics in Prometheus format through an HTTP endpoint. Type `strimziMetricsReporter` uses the Strimzi Metrics Reporter to directly expose Kafka metrics in Prometheus format through an HTTP endpoint. valueFrom: type: object properties: @@ -937,11 +581,22 @@ spec: optional: type: boolean description: Reference to the key in the ConfigMap containing the configuration. - description: 'ConfigMap entry where the Prometheus JMX Exporter configuration is stored. ' + description: ConfigMap entry where the Prometheus JMX Exporter configuration is stored. + values: + type: object + properties: + allowList: + type: array + items: + type: string + description: A list of regex patterns to filter the metrics to collect. Should contain at least one element. + description: Configuration values for the Strimzi Metrics Reporter. required: - type - - valueFrom description: Metrics configuration. + x-kubernetes-validations: + - rule: self.type != 'jmxPrometheusExporter' || has(self.valueFrom) + message: valueFrom property is required logging: type: object properties: @@ -976,30 +631,6 @@ spec: template: type: object properties: - statefulset: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - podManagementPolicy: - type: string - enum: - - OrderedReady - - Parallel - description: PodManagementPolicy which will be used for this StatefulSet. Valid values are `Parallel` and `OrderedReady`. Defaults to `Parallel`. - description: Template for Kafka `StatefulSet`. pod: type: object properties: @@ -1501,6 +1132,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -1536,7 +1196,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -1557,20 +1217,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -1578,7 +1238,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -1597,7 +1257,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -1605,7 +1273,75 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. + templatedVolumes: + type: array + items: + type: object + properties: + name: + type: string + description: Name to use for the volume. Required. + secret: + type: object + properties: + defaultMode: + type: integer + items: + type: array + items: + type: object + properties: + key: + type: string + mode: + type: integer + path: + type: string + optional: + type: boolean + secretName: + type: string + description: "`Secret` to use to populate the volume. The name of the Secret and the items key and path fields can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + configMap: + type: object + properties: + defaultMode: + type: integer + items: + type: array + items: + type: object + properties: + key: + type: string + mode: + type: integer + path: + type: string + name: + type: string + optional: + type: boolean + description: "`ConfigMap` to use to populate the volume. The name of the ConfigMap and the items key and path fields can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + persistentVolumeClaim: + type: object + properties: + claimName: + type: string + readOnly: + type: boolean + description: "`PersistentVolumeClaim` object to use to populate the volume. The name of the Persistent Volume Claim can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + oneOf: + - properties: + secret: {} + configMap: {} + persistentVolumeClaim: {} + description: Additional volumes that can be mounted to the pod. These volumes can use templates to mount different volumes into individual Pods. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." description: Template for Kafka `Pods`. bootstrapService: type: object @@ -2269,1194 +2005,6 @@ spec: required: - listeners description: Configuration of the Kafka cluster. - zookeeper: - type: object - properties: - replicas: - type: integer - minimum: 1 - description: The number of pods in the cluster. - image: - type: string - description: "The container image used for ZooKeeper pods. If no image name is explicitly specified, it is determined based on the Kafka version set in `spec.kafka.version`. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration." - storage: - type: object - properties: - class: - type: string - description: The storage class to use for dynamic volume allocation. - deleteClaim: - type: boolean - description: Specifies if the persistent volume claim has to be deleted when the cluster is un-deployed. - id: - type: integer - minimum: 0 - description: Storage identification number. Mandatory for storage volumes defined with a `jbod` storage type configuration. - kraftMetadata: - type: string - enum: - - shared - description: "Specifies whether this volume should be used for storing KRaft metadata. This property is optional. When set, the only currently supported value is `shared`. At most one volume can have this property set." - overrides: - type: array - items: - type: object - properties: - class: - type: string - description: The storage class to use for dynamic volume allocation for this broker. - broker: - type: integer - description: Id of the kafka broker (broker identifier). - description: Overrides for individual brokers. The `overrides` field allows you to specify a different configuration for different brokers. - selector: - additionalProperties: - type: string - type: object - description: Specifies a specific persistent volume to use. It contains key:value pairs representing labels for selecting such a volume. - size: - type: string - description: "When `type=persistent-claim`, defines the size of the persistent volume claim, such as 100Gi. Mandatory when `type=persistent-claim`." - sizeLimit: - type: string - pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" - description: "When type=ephemeral, defines the total amount of local storage required for this EmptyDir volume (for example 1Gi)." - type: - type: string - enum: - - ephemeral - - persistent-claim - description: "Storage type, must be either 'ephemeral' or 'persistent-claim'." - required: - - type - description: Storage configuration (disk). Cannot be updated. - config: - x-kubernetes-preserve-unknown-fields: true - type: object - description: "The ZooKeeper broker config. Properties with the following prefixes cannot be set: server., dataDir, dataLogDir, clientPort, authProvider, quorum.auth, requireClientAuthScheme, snapshot.trust.empty, standaloneEnabled, reconfigEnabled, 4lw.commands.whitelist, secureClientPort, ssl., serverCnxnFactory, sslQuorum (with the exception of: ssl.protocol, ssl.quorum.protocol, ssl.enabledProtocols, ssl.quorum.enabledProtocols, ssl.ciphersuites, ssl.quorum.ciphersuites, ssl.hostnameVerification, ssl.quorum.hostnameVerification)." - livenessProbe: - type: object - properties: - initialDelaySeconds: - type: integer - minimum: 0 - description: The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0. - timeoutSeconds: - type: integer - minimum: 1 - description: The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1. - periodSeconds: - type: integer - minimum: 1 - description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. - successThreshold: - type: integer - minimum: 1 - description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1. - failureThreshold: - type: integer - minimum: 1 - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. - description: Pod liveness checking. - readinessProbe: - type: object - properties: - initialDelaySeconds: - type: integer - minimum: 0 - description: The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0. - timeoutSeconds: - type: integer - minimum: 1 - description: The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1. - periodSeconds: - type: integer - minimum: 1 - description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. - successThreshold: - type: integer - minimum: 1 - description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1. - failureThreshold: - type: integer - minimum: 1 - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. - description: Pod readiness checking. - jvmOptions: - type: object - properties: - "-XX": - additionalProperties: - type: string - type: object - description: A map of -XX options to the JVM. - "-Xmx": - type: string - pattern: "^[0-9]+[mMgG]?$" - description: -Xmx option to to the JVM. - "-Xms": - type: string - pattern: "^[0-9]+[mMgG]?$" - description: -Xms option to to the JVM. - gcLoggingEnabled: - type: boolean - description: Specifies whether the Garbage Collection logging is enabled. The default is false. - javaSystemProperties: - type: array - items: - type: object - properties: - name: - type: string - description: The system property name. - value: - type: string - description: The system property value. - description: A map of additional system properties which will be passed using the `-D` option to the JVM. - description: JVM Options for pods. - jmxOptions: - type: object - properties: - authentication: - type: object - properties: - type: - type: string - enum: - - password - description: Authentication type. Currently the only supported types are `password`.`password` type creates a username and protected port with no TLS. - required: - - type - description: Authentication configuration for connecting to the JMX port. - description: JMX Options for Zookeeper nodes. - resources: - type: object - properties: - claims: - type: array - items: - type: object - properties: - name: - type: string - request: - type: string - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - description: CPU and memory resources to reserve. - metricsConfig: - type: object - properties: - type: - type: string - enum: - - jmxPrometheusExporter - description: Metrics type. Only 'jmxPrometheusExporter' supported currently. - valueFrom: - type: object - properties: - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to the key in the ConfigMap containing the configuration. - description: 'ConfigMap entry where the Prometheus JMX Exporter configuration is stored. ' - required: - - type - - valueFrom - description: Metrics configuration. - logging: - type: object - properties: - loggers: - additionalProperties: - type: string - type: object - description: A Map from logger name to logger level. - type: - type: string - enum: - - inline - - external - description: "Logging type, must be either 'inline' or 'external'." - valueFrom: - type: object - properties: - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to the key in the ConfigMap containing the configuration. - description: '`ConfigMap` entry where the logging configuration is stored. ' - required: - - type - description: Logging configuration for ZooKeeper. - template: - type: object - properties: - statefulset: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - podManagementPolicy: - type: string - enum: - - OrderedReady - - Parallel - description: PodManagementPolicy which will be used for this StatefulSet. Valid values are `Parallel` and `OrderedReady`. Defaults to `Parallel`. - description: Template for ZooKeeper `StatefulSet`. - podSet: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - description: Template for ZooKeeper `StrimziPodSet` resource. - pod: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - imagePullSecrets: - type: array - items: - type: object - properties: - name: - type: string - description: "List of references to secrets in the same namespace to use for pulling any of the images used by this Pod. When the `STRIMZI_IMAGE_PULL_SECRETS` environment variable in Cluster Operator and the `imagePullSecrets` option are specified, only the `imagePullSecrets` variable is used and the `STRIMZI_IMAGE_PULL_SECRETS` variable is ignored." - securityContext: - type: object - properties: - appArmorProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - fsGroup: - type: integer - fsGroupChangePolicy: - type: string - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - runAsUser: - type: integer - seLinuxChangePolicy: - type: string - seLinuxOptions: - type: object - properties: - level: - type: string - role: - type: string - type: - type: string - user: - type: string - seccompProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - supplementalGroups: - type: array - items: - type: integer - supplementalGroupsPolicy: - type: string - sysctls: - type: array - items: - type: object - properties: - name: - type: string - value: - type: string - windowsOptions: - type: object - properties: - gmsaCredentialSpec: - type: string - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - runAsUserName: - type: string - description: Configures pod-level security attributes and common container settings. - terminationGracePeriodSeconds: - type: integer - minimum: 0 - description: "The grace period is the duration in seconds after the processes running in the pod are sent a termination signal, and the time when the processes are forcibly halted with a kill signal. Set this value to longer than the expected cleanup time for your process. Value must be a non-negative integer. A zero value indicates delete immediately. You might need to increase the grace period for very large Kafka clusters, so that the Kafka brokers have enough time to transfer their work to another broker before they are terminated. Defaults to 30 seconds." - affinity: - type: object - properties: - nodeAffinity: - type: object - properties: - preferredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - preference: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchFields: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - weight: - type: integer - requiredDuringSchedulingIgnoredDuringExecution: - type: object - properties: - nodeSelectorTerms: - type: array - items: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchFields: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - podAffinity: - type: object - properties: - preferredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - podAffinityTerm: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - weight: - type: integer - requiredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - podAntiAffinity: - type: object - properties: - preferredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - podAffinityTerm: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - weight: - type: integer - requiredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - description: The pod's affinity rules. - tolerations: - type: array - items: - type: object - properties: - effect: - type: string - key: - type: string - operator: - type: string - tolerationSeconds: - type: integer - value: - type: string - description: The pod's tolerations. - topologySpreadConstraints: - type: array - items: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - maxSkew: - type: integer - minDomains: - type: integer - nodeAffinityPolicy: - type: string - nodeTaintsPolicy: - type: string - topologyKey: - type: string - whenUnsatisfiable: - type: string - description: The pod's topology spread constraints. - priorityClassName: - type: string - description: 'The name of the priority class used to assign priority to the pods. ' - schedulerName: - type: string - description: "The name of the scheduler used to dispatch this `Pod`. If not specified, the default scheduler will be used." - hostAliases: - type: array - items: - type: object - properties: - hostnames: - type: array - items: - type: string - ip: - type: string - description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. - enableServiceLinks: - type: boolean - description: Indicates whether information about services should be injected into Pod's environment variables. - tmpDirSizeLimit: - type: string - pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" - description: "Defines the total amount of pod memory allocated for the temporary `EmptyDir` volume `/tmp`. Specify the allocation in memory units, for example, `100Mi` for 100 mebibytes. Default value is `5Mi`. The `/tmp` volume is backed by pod memory, not disk storage, so avoid setting a high value as it consumes pod memory resources." - volumes: - type: array - items: - type: object - properties: - name: - type: string - description: Name to use for the volume. Required. - secret: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - optional: - type: boolean - secretName: - type: string - description: Secret to use populate the volume. - configMap: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - name: - type: string - optional: - type: boolean - description: ConfigMap to use to populate the volume. - emptyDir: - type: object - properties: - medium: - type: string - sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. - persistentVolumeClaim: - type: object - properties: - claimName: - type: string - readOnly: - type: boolean - description: PersistentVolumeClaim object to use to populate the volume. - csi: - type: object - properties: - driver: - type: string - fsType: - type: string - nodePublishSecretRef: - type: object - properties: - name: - type: string - readOnly: - type: boolean - volumeAttributes: - additionalProperties: - type: string - type: object - description: CSIVolumeSource object to use to populate the volume. - oneOf: - - properties: - secret: {} - configMap: {} - emptyDir: {} - persistentVolumeClaim: {} - csi: {} - description: Additional volumes that can be mounted to the pod. - description: Template for ZooKeeper `Pods`. - clientService: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - ipFamilyPolicy: - type: string - enum: - - SingleStack - - PreferDualStack - - RequireDualStack - description: "Specifies the IP Family Policy used by the service. Available options are `SingleStack`, `PreferDualStack` and `RequireDualStack`. `SingleStack` is for a single IP family. `PreferDualStack` is for two IP families on dual-stack configured clusters or a single IP family on single-stack clusters. `RequireDualStack` fails unless there are two IP families on dual-stack configured clusters. If unspecified, Kubernetes will choose the default value based on the service type." - ipFamilies: - type: array - items: - type: string - enum: - - IPv4 - - IPv6 - description: "Specifies the IP Families used by the service. Available options are `IPv4` and `IPv6`. If unspecified, Kubernetes will choose the default value based on the `ipFamilyPolicy` setting." - description: Template for ZooKeeper client `Service`. - nodesService: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - ipFamilyPolicy: - type: string - enum: - - SingleStack - - PreferDualStack - - RequireDualStack - description: "Specifies the IP Family Policy used by the service. Available options are `SingleStack`, `PreferDualStack` and `RequireDualStack`. `SingleStack` is for a single IP family. `PreferDualStack` is for two IP families on dual-stack configured clusters or a single IP family on single-stack clusters. `RequireDualStack` fails unless there are two IP families on dual-stack configured clusters. If unspecified, Kubernetes will choose the default value based on the service type." - ipFamilies: - type: array - items: - type: string - enum: - - IPv4 - - IPv6 - description: "Specifies the IP Families used by the service. Available options are `IPv4` and `IPv6`. If unspecified, Kubernetes will choose the default value based on the `ipFamilyPolicy` setting." - description: Template for ZooKeeper nodes `Service`. - persistentVolumeClaim: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - description: Template for all ZooKeeper `PersistentVolumeClaims`. - podDisruptionBudget: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource. - maxUnavailable: - type: integer - minimum: 0 - description: "Maximum number of unavailable pods to allow automatic Pod eviction. A Pod eviction is allowed when the `maxUnavailable` number of pods or fewer are unavailable after the eviction. Setting this value to 0 prevents all voluntary evictions, so the pods must be evicted manually. Defaults to 1." - description: Template for ZooKeeper `PodDisruptionBudget`. - zookeeperContainer: - type: object - properties: - env: - type: array - items: - type: object - properties: - name: - type: string - description: The environment variable key. - value: - type: string - description: The environment variable value. - valueFrom: - type: object - properties: - secretKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a secret. - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a config map. - oneOf: - - properties: - secretKeyRef: {} - required: - - secretKeyRef - - properties: - configMapKeyRef: {} - required: - - configMapKeyRef - description: Reference to the secret or config map property to which the environment variable is set. - oneOf: - - properties: - value: {} - required: - - value - - properties: - valueFrom: {} - required: - - valueFrom - description: Environment variables which should be applied to the container. - securityContext: - type: object - properties: - allowPrivilegeEscalation: - type: boolean - appArmorProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - capabilities: - type: object - properties: - add: - type: array - items: - type: string - drop: - type: array - items: - type: string - privileged: - type: boolean - procMount: - type: string - readOnlyRootFilesystem: - type: boolean - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - runAsUser: - type: integer - seLinuxOptions: - type: object - properties: - level: - type: string - role: - type: string - type: - type: string - user: - type: string - seccompProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - windowsOptions: - type: object - properties: - gmsaCredentialSpec: - type: string - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - runAsUserName: - type: string - description: Security context for the container. - volumeMounts: - type: array - items: - type: object - properties: - mountPath: - type: string - mountPropagation: - type: string - name: - type: string - readOnly: - type: boolean - recursiveReadOnly: - type: string - subPath: - type: string - subPathExpr: - type: string - description: Additional volume mounts which should be applied to the container. - description: Template for the ZooKeeper container. - serviceAccount: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - description: Template for the ZooKeeper service account. - jmxSecret: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - description: Template for Secret of the Zookeeper Cluster JMX authentication. - description: Template for ZooKeeper cluster resources. The template allows users to specify how the Kubernetes resources are generated. - required: - - replicas - - storage - description: Configuration of the ZooKeeper cluster. This section is required when running a ZooKeeper-based Apache Kafka cluster. entityOperator: type: object properties: @@ -3469,18 +2017,10 @@ spec: image: type: string description: The image to use for the Topic Operator. - reconciliationIntervalSeconds: - type: integer - minimum: 0 - description: Interval between periodic reconciliations in seconds. Ignored if reconciliationIntervalMs is set. reconciliationIntervalMs: type: integer minimum: 0 description: Interval between periodic reconciliations in milliseconds. - zookeeperSessionTimeoutSeconds: - type: integer - minimum: 0 - description: Timeout for the ZooKeeper session. startupProbe: type: object properties: @@ -3582,10 +2122,6 @@ spec: x-kubernetes-int-or-string: true type: object description: CPU and memory resources to reserve. - topicMetadataMaxAttempts: - type: integer - minimum: 0 - description: The number of attempts at getting topic metadata. logging: type: object properties: @@ -3659,18 +2195,10 @@ spec: image: type: string description: The image to use for the User Operator. - reconciliationIntervalSeconds: - type: integer - minimum: 0 - description: Interval between periodic reconciliations in seconds. Ignored if reconciliationIntervalMs is set. reconciliationIntervalMs: type: integer minimum: 0 description: Interval between periodic reconciliations in milliseconds. - zookeeperSessionTimeoutSeconds: - type: integer - minimum: 0 - description: Timeout for the ZooKeeper session. secretPrefix: type: string description: The prefix that will be added to the KafkaUser name to be used as the Secret name. @@ -3815,102 +2343,6 @@ spec: description: A map of additional system properties which will be passed using the `-D` option to the JVM. description: JVM Options for pods. description: Configuration of the User Operator. - tlsSidecar: - type: object - properties: - image: - type: string - description: The docker image for the container. - resources: - type: object - properties: - claims: - type: array - items: - type: object - properties: - name: - type: string - request: - type: string - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - description: CPU and memory resources to reserve. - livenessProbe: - type: object - properties: - initialDelaySeconds: - type: integer - minimum: 0 - description: The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0. - timeoutSeconds: - type: integer - minimum: 1 - description: The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1. - periodSeconds: - type: integer - minimum: 1 - description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. - successThreshold: - type: integer - minimum: 1 - description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1. - failureThreshold: - type: integer - minimum: 1 - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. - description: Pod liveness checking. - readinessProbe: - type: object - properties: - initialDelaySeconds: - type: integer - minimum: 0 - description: The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0. - timeoutSeconds: - type: integer - minimum: 1 - description: The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1. - periodSeconds: - type: integer - minimum: 1 - description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. - successThreshold: - type: integer - minimum: 1 - description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1. - failureThreshold: - type: integer - minimum: 1 - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. - description: Pod readiness checking. - logLevel: - type: string - enum: - - emerg - - alert - - crit - - err - - warning - - notice - - info - - debug - description: The log level for the TLS sidecar. Default value is `notice`. - description: TLS sidecar configuration. template: type: object properties: @@ -4439,6 +2871,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -4474,7 +2935,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -4495,20 +2956,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -4516,7 +2977,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -4535,7 +2996,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -4543,7 +3012,11 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." description: Template for Entity Operator `Pods`. topicOperatorContainer: type: object @@ -4831,149 +3304,6 @@ spec: type: string description: Additional volume mounts which should be applied to the container. description: Template for the Entity User Operator container. - tlsSidecarContainer: - type: object - properties: - env: - type: array - items: - type: object - properties: - name: - type: string - description: The environment variable key. - value: - type: string - description: The environment variable value. - valueFrom: - type: object - properties: - secretKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a secret. - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a config map. - oneOf: - - properties: - secretKeyRef: {} - required: - - secretKeyRef - - properties: - configMapKeyRef: {} - required: - - configMapKeyRef - description: Reference to the secret or config map property to which the environment variable is set. - oneOf: - - properties: - value: {} - required: - - value - - properties: - valueFrom: {} - required: - - valueFrom - description: Environment variables which should be applied to the container. - securityContext: - type: object - properties: - allowPrivilegeEscalation: - type: boolean - appArmorProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - capabilities: - type: object - properties: - add: - type: array - items: - type: string - drop: - type: array - items: - type: string - privileged: - type: boolean - procMount: - type: string - readOnlyRootFilesystem: - type: boolean - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - runAsUser: - type: integer - seLinuxOptions: - type: object - properties: - level: - type: string - role: - type: string - type: - type: string - user: - type: string - seccompProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - windowsOptions: - type: object - properties: - gmsaCredentialSpec: - type: string - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - runAsUserName: - type: string - description: Security context for the container. - volumeMounts: - type: array - items: - type: object - properties: - mountPath: - type: string - mountPropagation: - type: string - name: - type: string - readOnly: - type: boolean - recursiveReadOnly: - type: string - subPath: - type: string - subPathExpr: - type: string - description: Additional volume mounts which should be applied to the container. - description: Template for the Entity Operator TLS sidecar container. serviceAccount: type: object properties: @@ -4992,6 +3322,28 @@ spec: description: Annotations added to the Kubernetes resource. description: Metadata applied to the resource. description: Template for the Entity Operator service account. + podDisruptionBudget: + type: object + properties: + metadata: + type: object + properties: + labels: + additionalProperties: + type: string + type: object + description: Labels added to the Kubernetes resource. + annotations: + additionalProperties: + type: string + type: object + description: Annotations added to the Kubernetes resource. + description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource. + maxUnavailable: + type: integer + minimum: 0 + description: "Maximum number of unavailable pods to allow automatic Pod eviction. A Pod eviction is allowed when the `maxUnavailable` number of pods or fewer are unavailable after the eviction. Setting this value to 0 prevents all voluntary evictions, so the pods must be evicted manually. Defaults to 1." + description: Template for the Entity Operator Pod Disruption Budget. entityOperatorRole: type: object properties: @@ -5102,102 +3454,6 @@ spec: image: type: string description: "The container image used for Cruise Control pods. If no image name is explicitly specified, the image name corresponds to the name specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used." - tlsSidecar: - type: object - properties: - image: - type: string - description: The docker image for the container. - resources: - type: object - properties: - claims: - type: array - items: - type: object - properties: - name: - type: string - request: - type: string - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - description: CPU and memory resources to reserve. - livenessProbe: - type: object - properties: - initialDelaySeconds: - type: integer - minimum: 0 - description: The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0. - timeoutSeconds: - type: integer - minimum: 1 - description: The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1. - periodSeconds: - type: integer - minimum: 1 - description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. - successThreshold: - type: integer - minimum: 1 - description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1. - failureThreshold: - type: integer - minimum: 1 - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. - description: Pod liveness checking. - readinessProbe: - type: object - properties: - initialDelaySeconds: - type: integer - minimum: 0 - description: The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0. - timeoutSeconds: - type: integer - minimum: 1 - description: The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1. - periodSeconds: - type: integer - minimum: 1 - description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. - successThreshold: - type: integer - minimum: 1 - description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1. - failureThreshold: - type: integer - minimum: 1 - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. - description: Pod readiness checking. - logLevel: - type: string - enum: - - emerg - - alert - - crit - - err - - warning - - notice - - info - - debug - description: The log level for the TLS sidecar. Default value is `notice`. - description: TLS sidecar configuration. resources: type: object properties: @@ -5866,6 +4122,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -5901,7 +4186,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -5922,20 +4207,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -5943,7 +4228,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -5962,7 +4247,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -5970,7 +4263,11 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." description: Template for Cruise Control `Pods`. apiService: type: object @@ -6170,149 +4467,6 @@ spec: type: string description: Additional volume mounts which should be applied to the container. description: Template for the Cruise Control container. - tlsSidecarContainer: - type: object - properties: - env: - type: array - items: - type: object - properties: - name: - type: string - description: The environment variable key. - value: - type: string - description: The environment variable value. - valueFrom: - type: object - properties: - secretKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a secret. - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a config map. - oneOf: - - properties: - secretKeyRef: {} - required: - - secretKeyRef - - properties: - configMapKeyRef: {} - required: - - configMapKeyRef - description: Reference to the secret or config map property to which the environment variable is set. - oneOf: - - properties: - value: {} - required: - - value - - properties: - valueFrom: {} - required: - - valueFrom - description: Environment variables which should be applied to the container. - securityContext: - type: object - properties: - allowPrivilegeEscalation: - type: boolean - appArmorProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - capabilities: - type: object - properties: - add: - type: array - items: - type: string - drop: - type: array - items: - type: string - privileged: - type: boolean - procMount: - type: string - readOnlyRootFilesystem: - type: boolean - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - runAsUser: - type: integer - seLinuxOptions: - type: object - properties: - level: - type: string - role: - type: string - type: - type: string - user: - type: string - seccompProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - windowsOptions: - type: object - properties: - gmsaCredentialSpec: - type: string - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - runAsUserName: - type: string - description: Security context for the container. - volumeMounts: - type: array - items: - type: object - properties: - mountPath: - type: string - mountPropagation: - type: string - name: - type: string - readOnly: - type: boolean - recursiveReadOnly: - type: string - subPath: - type: string - subPathExpr: - type: string - description: Additional volume mounts which should be applied to the container. - description: Template for the Cruise Control TLS sidecar container. serviceAccount: type: object properties: @@ -6335,15 +4489,6 @@ spec: brokerCapacity: type: object properties: - disk: - type: string - pattern: "^[0-9]+([.][0-9]*)?([KMGTPE]i?|e[0-9]+)?$" - description: "Broker capacity for disk in bytes. Use a number value with either standard Kubernetes byte units (K, M, G, or T), their bibyte (power of two) equivalents (Ki, Mi, Gi, or Ti), or a byte value with or without E notation. For example, 100000M, 100000Mi, 104857600000, or 1e+11." - cpuUtilization: - type: integer - minimum: 0 - maximum: 100 - description: Broker capacity for CPU resource utilization as a percentage (0 - 100). cpu: type: string pattern: "^[0-9]+([.][0-9]{0,3}|[m]?)$" @@ -6393,7 +4538,8 @@ spec: type: string enum: - jmxPrometheusExporter - description: Metrics type. Only 'jmxPrometheusExporter' supported currently. + - strimziMetricsReporter + description: Metrics type. The supported types are `jmxPrometheusExporter` and `strimziMetricsReporter`. Type `jmxPrometheusExporter` uses the Prometheus JMX Exporter to expose Kafka JMX metrics in Prometheus format through an HTTP endpoint. Type `strimziMetricsReporter` uses the Strimzi Metrics Reporter to directly expose Kafka metrics in Prometheus format through an HTTP endpoint. valueFrom: type: object properties: @@ -6407,11 +4553,24 @@ spec: optional: type: boolean description: Reference to the key in the ConfigMap containing the configuration. - description: 'ConfigMap entry where the Prometheus JMX Exporter configuration is stored. ' + description: ConfigMap entry where the Prometheus JMX Exporter configuration is stored. + values: + type: object + properties: + allowList: + type: array + items: + type: string + description: A list of regex patterns to filter the metrics to collect. Should contain at least one element. + description: Configuration values for the Strimzi Metrics Reporter. required: - type - - valueFrom - description: Metrics configuration. + description: "Metrics configuration. Only `jmxPrometheusExporter` can be configured, as this component does not support `strimziMetricsReporter`." + x-kubernetes-validations: + - rule: self.type != 'jmxPrometheusExporter' || has(self.valueFrom) + message: valueFrom property is required + - rule: self.type != 'strimziMetricsReporter' + message: value type not supported apiUsers: type: object properties: @@ -6460,896 +4619,6 @@ spec: - mode description: "Auto-rebalancing on scaling related configuration listing the modes, when brokers are added or removed, with the corresponding rebalance template configurations.If this field is set, at least one mode has to be defined." description: Configuration for Cruise Control deployment. Deploys a Cruise Control instance when specified. - jmxTrans: - type: object - properties: - image: - type: string - description: The image to use for the JmxTrans. - outputDefinitions: - type: array - items: - type: object - properties: - outputType: - type: string - description: "Template for setting the format of the data that will be pushed.For more information see https://github.com/jmxtrans/jmxtrans/wiki/OutputWriters[JmxTrans OutputWriters]." - host: - type: string - description: The DNS/hostname of the remote host that the data is pushed to. - port: - type: integer - description: The port of the remote host that the data is pushed to. - flushDelayInSeconds: - type: integer - description: How many seconds the JmxTrans waits before pushing a new set of data out. - typeNames: - type: array - items: - type: string - description: "Template for filtering data to be included in response to a wildcard query. For more information see https://github.com/jmxtrans/jmxtrans/wiki/Queries[JmxTrans queries]." - name: - type: string - description: Template for setting the name of the output definition. This is used to identify where to send the results of queries should be sent. - required: - - outputType - - name - description: "Defines the output hosts that will be referenced later on. For more information on these properties see, xref:type-JmxTransOutputDefinitionTemplate-reference[`JmxTransOutputDefinitionTemplate` schema reference]." - logLevel: - type: string - description: "Sets the logging level of the JmxTrans deployment.For more information see, https://github.com/jmxtrans/jmxtrans-agent/wiki/Troubleshooting[JmxTrans Logging Level]." - kafkaQueries: - type: array - items: - type: object - properties: - targetMBean: - type: string - description: If using wildcards instead of a specific MBean then the data is gathered from multiple MBeans. Otherwise if specifying an MBean then data is gathered from that specified MBean. - attributes: - type: array - items: - type: string - description: Determine which attributes of the targeted MBean should be included. - outputs: - type: array - items: - type: string - description: "List of the names of output definitions specified in the spec.kafka.jmxTrans.outputDefinitions that have defined where JMX metrics are pushed to, and in which data format." - required: - - targetMBean - - attributes - - outputs - description: "Queries to send to the Kafka brokers to define what data should be read from each broker. For more information on these properties see, xref:type-JmxTransQueryTemplate-reference[`JmxTransQueryTemplate` schema reference]." - resources: - type: object - properties: - claims: - type: array - items: - type: object - properties: - name: - type: string - request: - type: string - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - description: CPU and memory resources to reserve. - template: - type: object - properties: - deployment: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - deploymentStrategy: - type: string - enum: - - RollingUpdate - - Recreate - description: Pod replacement strategy for deployment configuration changes. Valid values are `RollingUpdate` and `Recreate`. Defaults to `RollingUpdate`. - description: Template for JmxTrans `Deployment`. - pod: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - imagePullSecrets: - type: array - items: - type: object - properties: - name: - type: string - description: "List of references to secrets in the same namespace to use for pulling any of the images used by this Pod. When the `STRIMZI_IMAGE_PULL_SECRETS` environment variable in Cluster Operator and the `imagePullSecrets` option are specified, only the `imagePullSecrets` variable is used and the `STRIMZI_IMAGE_PULL_SECRETS` variable is ignored." - securityContext: - type: object - properties: - appArmorProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - fsGroup: - type: integer - fsGroupChangePolicy: - type: string - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - runAsUser: - type: integer - seLinuxChangePolicy: - type: string - seLinuxOptions: - type: object - properties: - level: - type: string - role: - type: string - type: - type: string - user: - type: string - seccompProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - supplementalGroups: - type: array - items: - type: integer - supplementalGroupsPolicy: - type: string - sysctls: - type: array - items: - type: object - properties: - name: - type: string - value: - type: string - windowsOptions: - type: object - properties: - gmsaCredentialSpec: - type: string - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - runAsUserName: - type: string - description: Configures pod-level security attributes and common container settings. - terminationGracePeriodSeconds: - type: integer - minimum: 0 - description: "The grace period is the duration in seconds after the processes running in the pod are sent a termination signal, and the time when the processes are forcibly halted with a kill signal. Set this value to longer than the expected cleanup time for your process. Value must be a non-negative integer. A zero value indicates delete immediately. You might need to increase the grace period for very large Kafka clusters, so that the Kafka brokers have enough time to transfer their work to another broker before they are terminated. Defaults to 30 seconds." - affinity: - type: object - properties: - nodeAffinity: - type: object - properties: - preferredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - preference: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchFields: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - weight: - type: integer - requiredDuringSchedulingIgnoredDuringExecution: - type: object - properties: - nodeSelectorTerms: - type: array - items: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchFields: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - podAffinity: - type: object - properties: - preferredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - podAffinityTerm: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - weight: - type: integer - requiredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - podAntiAffinity: - type: object - properties: - preferredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - podAffinityTerm: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - weight: - type: integer - requiredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - description: The pod's affinity rules. - tolerations: - type: array - items: - type: object - properties: - effect: - type: string - key: - type: string - operator: - type: string - tolerationSeconds: - type: integer - value: - type: string - description: The pod's tolerations. - topologySpreadConstraints: - type: array - items: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - maxSkew: - type: integer - minDomains: - type: integer - nodeAffinityPolicy: - type: string - nodeTaintsPolicy: - type: string - topologyKey: - type: string - whenUnsatisfiable: - type: string - description: The pod's topology spread constraints. - priorityClassName: - type: string - description: 'The name of the priority class used to assign priority to the pods. ' - schedulerName: - type: string - description: "The name of the scheduler used to dispatch this `Pod`. If not specified, the default scheduler will be used." - hostAliases: - type: array - items: - type: object - properties: - hostnames: - type: array - items: - type: string - ip: - type: string - description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. - enableServiceLinks: - type: boolean - description: Indicates whether information about services should be injected into Pod's environment variables. - tmpDirSizeLimit: - type: string - pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" - description: "Defines the total amount of pod memory allocated for the temporary `EmptyDir` volume `/tmp`. Specify the allocation in memory units, for example, `100Mi` for 100 mebibytes. Default value is `5Mi`. The `/tmp` volume is backed by pod memory, not disk storage, so avoid setting a high value as it consumes pod memory resources." - volumes: - type: array - items: - type: object - properties: - name: - type: string - description: Name to use for the volume. Required. - secret: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - optional: - type: boolean - secretName: - type: string - description: Secret to use populate the volume. - configMap: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - name: - type: string - optional: - type: boolean - description: ConfigMap to use to populate the volume. - emptyDir: - type: object - properties: - medium: - type: string - sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. - persistentVolumeClaim: - type: object - properties: - claimName: - type: string - readOnly: - type: boolean - description: PersistentVolumeClaim object to use to populate the volume. - csi: - type: object - properties: - driver: - type: string - fsType: - type: string - nodePublishSecretRef: - type: object - properties: - name: - type: string - readOnly: - type: boolean - volumeAttributes: - additionalProperties: - type: string - type: object - description: CSIVolumeSource object to use to populate the volume. - oneOf: - - properties: - secret: {} - configMap: {} - emptyDir: {} - persistentVolumeClaim: {} - csi: {} - description: Additional volumes that can be mounted to the pod. - description: Template for JmxTrans `Pods`. - container: - type: object - properties: - env: - type: array - items: - type: object - properties: - name: - type: string - description: The environment variable key. - value: - type: string - description: The environment variable value. - valueFrom: - type: object - properties: - secretKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a secret. - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a config map. - oneOf: - - properties: - secretKeyRef: {} - required: - - secretKeyRef - - properties: - configMapKeyRef: {} - required: - - configMapKeyRef - description: Reference to the secret or config map property to which the environment variable is set. - oneOf: - - properties: - value: {} - required: - - value - - properties: - valueFrom: {} - required: - - valueFrom - description: Environment variables which should be applied to the container. - securityContext: - type: object - properties: - allowPrivilegeEscalation: - type: boolean - appArmorProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - capabilities: - type: object - properties: - add: - type: array - items: - type: string - drop: - type: array - items: - type: string - privileged: - type: boolean - procMount: - type: string - readOnlyRootFilesystem: - type: boolean - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - runAsUser: - type: integer - seLinuxOptions: - type: object - properties: - level: - type: string - role: - type: string - type: - type: string - user: - type: string - seccompProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - windowsOptions: - type: object - properties: - gmsaCredentialSpec: - type: string - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - runAsUserName: - type: string - description: Security context for the container. - volumeMounts: - type: array - items: - type: object - properties: - mountPath: - type: string - mountPropagation: - type: string - name: - type: string - readOnly: - type: boolean - recursiveReadOnly: - type: string - subPath: - type: string - subPathExpr: - type: string - description: Additional volume mounts which should be applied to the container. - description: Template for JmxTrans container. - serviceAccount: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - description: Template for the JmxTrans service account. - description: Template for JmxTrans resources. - required: - - outputDefinitions - - kafkaQueries - description: "As of Strimzi 0.35.0, JMXTrans is not supported anymore and this option is ignored." kafkaExporter: type: object properties: @@ -7982,6 +5251,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -8017,7 +5315,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -8038,20 +5336,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -8059,7 +5357,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -8078,7 +5376,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -8086,26 +5392,12 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." description: Template for Kafka Exporter `Pods`. - service: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - description: Template for Kafka Exporter `Service`. container: type: object properties: @@ -8267,6 +5559,28 @@ spec: description: Annotations added to the Kubernetes resource. description: Metadata applied to the resource. description: Template for the Kafka Exporter service account. + podDisruptionBudget: + type: object + properties: + metadata: + type: object + properties: + labels: + additionalProperties: + type: string + type: object + description: Labels added to the Kubernetes resource. + annotations: + additionalProperties: + type: string + type: object + description: Annotations added to the Kubernetes resource. + description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource. + maxUnavailable: + type: integer + minimum: 0 + description: "Maximum number of unavailable pods to allow automatic Pod eviction. A Pod eviction is allowed when the `maxUnavailable` number of pods or fewer are unavailable after the eviction. Setting this value to 0 prevents all voluntary evictions, so the pods must be evicted manually. Defaults to 1." + description: Template for the Pod Disruption Budget for Kafka Exporter pods. description: Customization of deployment templates and pods. description: "Configuration of the Kafka Exporter. Kafka Exporter can provide additional metrics, for example lag of consumer group at topic/partition." maintenanceTimeWindows: @@ -8276,7 +5590,7 @@ spec: description: "A list of time windows for maintenance tasks (that is, certificates renewal). Each time window is defined by a cron expression." required: - kafka - description: "The specification of the Kafka and ZooKeeper clusters, and Topic Operator." + description: The specification of the Kafka cluster. status: type: object properties: @@ -8309,9 +5623,6 @@ spec: items: type: object properties: - type: - type: string - description: The name of the listener. name: type: string description: The name of the listener. @@ -8345,11 +5656,6 @@ spec: type: string description: The name of the KafkaNodePool used by this Kafka resource. description: List of the KafkaNodePools used by this Kafka cluster. - registeredNodeIds: - type: array - items: - type: integer - description: Registered node IDs used by this Kafka cluster. This field is used for internal purposes only and will be removed in the future. clusterId: type: string description: Kafka cluster Id. @@ -8362,16 +5668,6 @@ spec: kafkaMetadataVersion: type: string description: The KRaft metadata.version currently used by the Kafka cluster. - kafkaMetadataState: - type: string - enum: - - ZooKeeper - - KRaftMigration - - KRaftDualWriting - - KRaftPostMigration - - PreKRaft - - KRaft - description: "Defines where cluster metadata are stored. Possible values are: ZooKeeper if the metadata are stored in ZooKeeper; KRaftMigration if the controllers are connected to ZooKeeper, brokers are being rolled with Zookeeper migration enabled and connection information to controllers, and the metadata migration process is running; KRaftDualWriting if the metadata migration process finished and the cluster is in dual-write mode; KRaftPostMigration if the brokers are fully KRaft-based but controllers being rolled to disconnect from ZooKeeper; PreKRaft if brokers and controller are fully KRaft-based, metadata are stored in KRaft, but ZooKeeper must be deleted; KRaft if the metadata are stored in KRaft." autoRebalance: type: object properties: @@ -8403,4 +5699,11 @@ spec: description: "List of broker IDs involved in an auto-rebalancing operation related to the current mode. \nThe list contains one of the following: \n\n* Broker IDs for a current auto-rebalance. \n* Broker IDs for a queued auto-rebalance (if a previous auto-rebalance is still in progress). \n" description: "List of modes where an auto-rebalancing operation is either running or queued. \nEach mode entry (`add-brokers` or `remove-brokers`) includes one of the following: \n\n* Broker IDs for a current auto-rebalance. \n* Broker IDs for a queued auto-rebalance (if a previous rebalance is still in progress)." description: The status of an auto-rebalancing triggered by a cluster scaling request. - description: "The status of the Kafka and ZooKeeper clusters, and Topic Operator." + clusterSecurity: + type: object + properties: {} + x-kubernetes-preserve-unknown-fields: true + description: The current security configuration of the Kafka cluster. + description: The status of the Kafka cluster. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/041-Crd-kafkaconnect.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/041-Crd-kafkaconnect.yaml index 2aa3fcf32..2f546f518 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/041-Crd-kafkaconnect.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/041-Crd-kafkaconnect.yaml @@ -21,7 +21,7 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: @@ -59,13 +59,25 @@ spec: description: The Kafka Connect version. Defaults to the latest version. Consult the user documentation to understand the process required to upgrade or downgrade the version. replicas: type: integer - description: The number of pods in the Kafka Connect group. Defaults to `3`. + description: The number of pods in the Kafka Connect group. Required in the `v1` version of the Strimzi API. image: type: string description: "The container image used for Kafka Connect pods. If no image name is explicitly specified, it is determined based on the `spec.version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration." bootstrapServers: type: string description: Bootstrap servers to connect to. This should be given as a comma separated list of __:__ pairs. + groupId: + type: string + description: A unique ID that identifies the Connect cluster group. + configStorageTopic: + type: string + description: The name of the Kafka topic where connector configurations are stored. + statusStorageTopic: + type: string + description: The name of the Kafka topic where connector and task status are stored. + offsetStorageTopic: + type: string + description: The name of the Kafka topic where source connector offsets are stored. tls: type: object properties: @@ -99,28 +111,6 @@ spec: authentication: type: object properties: - accessToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the access token which was obtained from the authorization server. - accessTokenIsJwt: - type: boolean - description: Configure whether access token should be treated as JWT. This should be set to `false` if the authorization server returns opaque tokens. Defaults to `true`. - accessTokenLocation: - type: string - description: Path to the token file containing an access token to be used for authentication. - audience: - type: string - description: "OAuth audience to use when authenticating against the authorization server. Some authorization servers require the audience to be explicitly set. The possible values depend on how the authorization server is configured. By default, `audience` is not specified when performing the token endpoint request." certificateAndKey: type: object properties: @@ -132,68 +122,16 @@ spec: description: The name of the file certificate in the Secret. key: type: string - description: The name of the private key in the Secret. + description: "The name of the private key in the secret. The private key must be in unencrypted PKCS #8 format. For more information, see RFC 5208: https://datatracker.ietf.org/doc/html/rfc5208." required: - secretName - certificate - key description: Reference to the `Secret` which holds the certificate and private key pair. - clientAssertion: + config: + x-kubernetes-preserve-unknown-fields: true type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes secret containing the client assertion which was manually configured for the client. - clientAssertionLocation: - type: string - description: Path to the file containing the client assertion to be used for authentication. - clientAssertionType: - type: string - description: "The client assertion type. If not set, and either `clientAssertion` or `clientAssertionLocation` is configured, this value defaults to `urn:ietf:params:oauth:client-assertion-type:jwt-bearer`." - clientId: - type: string - description: OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - clientSecret: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the OAuth client secret which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - connectTimeoutSeconds: - type: integer - description: "The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds." - disableTlsHostnameVerification: - type: boolean - description: Enable or disable TLS hostname verification. Default value is `false`. - enableMetrics: - type: boolean - description: Enable or disable OAuth metrics. Default value is `false`. - httpRetries: - type: integer - description: "The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries." - httpRetryPauseMs: - type: integer - description: "The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request." - includeAcceptHeader: - type: boolean - description: Whether the Accept header should be set in requests to the authorization servers. The default value is `true`. - maxTokenExpirySeconds: - type: integer - description: Set or limit time-to-live of the access tokens to the specified number of seconds. This should be set if the authorization server returns opaque tokens. + description: Configuration for the custom authentication mechanism. Only properties with the `sasl.` and `ssl.keystore.` prefixes are allowed. Specify other options in the regular configuration section of the custom resource. passwordSecret: type: object properties: @@ -207,59 +145,9 @@ spec: - secretName - password description: Reference to the `Secret` which holds the password. - readTimeoutSeconds: - type: integer - description: "The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds." - refreshToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the refresh token which can be used to obtain access token from the authorization server. - saslExtensions: - additionalProperties: - type: string - type: object - description: SASL extensions parameters. - scope: - type: string - description: OAuth scope to use when authenticating against the authorization server. Some authorization servers require this to be set. The possible values depend on how authorization server is configured. By default `scope` is not specified when doing the token endpoint request. - tlsTrustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection to the OAuth server. - tokenEndpointUri: - type: string - description: Authorization server token endpoint URI. + sasl: + type: boolean + description: Enable or disable SASL on this authentication mechanism. type: type: string enum: @@ -267,8 +155,8 @@ spec: - scram-sha-256 - scram-sha-512 - plain - - oauth - description: "Authentication type. Currently the supported types are `tls`, `scram-sha-256`, `scram-sha-512`, `plain`, and 'oauth'. `scram-sha-256` and `scram-sha-512` types use SASL SCRAM-SHA-256 and SASL SCRAM-SHA-512 Authentication, respectively. `plain` type uses SASL PLAIN Authentication. `oauth` type uses SASL OAUTHBEARER Authentication. The `tls` type uses TLS Client Authentication. The `tls` type is supported only over TLS connections." + - custom + description: "Specifies the authentication type. Supported types are `tls`, `scram-sha-256`, `scram-sha-512`, `plain`, and `custom`. `tls` uses TLS client authentication and is supported only over TLS connections. `scram-sha-256` and `scram-sha-512` use SASL SCRAM-SHA-256 and SASL SCRAM-SHA-512 authentication, respectively. `plain` uses SASL PLAIN authentication. `custom` allows you to configure a custom authentication mechanism." username: type: string description: Username used for the authentication. @@ -278,7 +166,7 @@ spec: config: x-kubernetes-preserve-unknown-fields: true type: object - description: "The Kafka Connect configuration. Properties with the following prefixes cannot be set: ssl., sasl., security., listeners, plugin.path, rest., bootstrap.servers, consumer.interceptor.classes, producer.interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols)." + description: "The Kafka Connect configuration. Properties with the following prefixes cannot be set: group.id, config.storage.topic, offset.storage.topic, status.storage.topic, ssl., sasl., security., listeners, plugin.path, rest., bootstrap.servers, consumer.interceptor.classes, producer.interceptor.classes, prometheus.metrics.reporter. (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols)." resources: type: object properties: @@ -440,13 +328,25 @@ spec: rack: type: object properties: + envVarName: + type: string + description: The name of the environment variable that defines the rack ID. Its value sets the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect or MirrorMaker 2. topologyKey: type: string example: topology.kubernetes.io/zone description: "A key that matches labels assigned to the Kubernetes cluster nodes. The value of the label is used to set a broker's `broker.rack` config, and the `client.rack` config for Kafka Connect or MirrorMaker 2." - required: - - topologyKey + type: + type: string + enum: + - topology-label + - environment-variable + description: "Specifies the rack awareness type. Supported types are `topology-label` and `environment-variable`. `topology-label` uses a Kubernetes worker node label to set the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect and MirrorMaker 2. `environment-variable` uses an environment variable to set the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect and MirrorMaker 2. When not specified, `topology-label` type is used by default." description: Configuration of the node label which will be used as the `client.rack` consumer configuration. + x-kubernetes-validations: + - rule: (has(self.type) && self.type != "topology-label") || self.topologyKey != "" + message: topologyKey property is required + - rule: has(self.type) == false || self.type != "environment-variable" || self.envVarName != "" + message: envVarName property is required metricsConfig: type: object properties: @@ -454,7 +354,8 @@ spec: type: string enum: - jmxPrometheusExporter - description: Metrics type. Only 'jmxPrometheusExporter' supported currently. + - strimziMetricsReporter + description: Metrics type. The supported types are `jmxPrometheusExporter` and `strimziMetricsReporter`. Type `jmxPrometheusExporter` uses the Prometheus JMX Exporter to expose Kafka JMX metrics in Prometheus format through an HTTP endpoint. Type `strimziMetricsReporter` uses the Strimzi Metrics Reporter to directly expose Kafka metrics in Prometheus format through an HTTP endpoint. valueFrom: type: object properties: @@ -468,50 +369,36 @@ spec: optional: type: boolean description: Reference to the key in the ConfigMap containing the configuration. - description: 'ConfigMap entry where the Prometheus JMX Exporter configuration is stored. ' + description: ConfigMap entry where the Prometheus JMX Exporter configuration is stored. + values: + type: object + properties: + allowList: + type: array + items: + type: string + description: A list of regex patterns to filter the metrics to collect. Should contain at least one element. + description: Configuration values for the Strimzi Metrics Reporter. required: - type - - valueFrom description: Metrics configuration. + x-kubernetes-validations: + - rule: self.type != 'jmxPrometheusExporter' || has(self.valueFrom) + message: valueFrom property is required tracing: type: object properties: type: type: string enum: - - jaeger - opentelemetry - description: "Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. As of Strimzi 0.37.0, `jaeger` type is not supported anymore and this option is ignored." + description: Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. required: - type description: The configuration of tracing in Kafka Connect. template: type: object properties: - deployment: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - deploymentStrategy: - type: string - enum: - - RollingUpdate - - Recreate - description: Pod replacement strategy for deployment configuration changes. Valid values are `RollingUpdate` and `Recreate`. Defaults to `RollingUpdate`. - description: Template for Kafka Connect `Deployment`. podSet: type: object properties: @@ -1031,6 +918,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -1066,7 +982,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -1087,20 +1003,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -1108,7 +1024,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -1127,7 +1043,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -1135,7 +1059,75 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. + templatedVolumes: + type: array + items: + type: object + properties: + name: + type: string + description: Name to use for the volume. Required. + secret: + type: object + properties: + defaultMode: + type: integer + items: + type: array + items: + type: object + properties: + key: + type: string + mode: + type: integer + path: + type: string + optional: + type: boolean + secretName: + type: string + description: "`Secret` to use to populate the volume. The name of the Secret and the items key and path fields can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + configMap: + type: object + properties: + defaultMode: + type: integer + items: + type: array + items: + type: object + properties: + key: + type: string + mode: + type: integer + path: + type: string + name: + type: string + optional: + type: boolean + description: "`ConfigMap` to use to populate the volume. The name of the ConfigMap and the items key and path fields can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + persistentVolumeClaim: + type: object + properties: + claimName: + type: string + readOnly: + type: boolean + description: "`PersistentVolumeClaim` object to use to populate the volume. The name of the Persistent Volume Claim can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + oneOf: + - properties: + secret: {} + configMap: {} + persistentVolumeClaim: {} + description: Additional volumes that can be mounted to the pod. These volumes can use templates to mount different volumes into individual Pods. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." description: Template for Kafka Connect `Pods`. apiService: type: object @@ -2048,6 +2040,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -2083,7 +2104,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -2104,20 +2125,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -2125,7 +2146,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -2144,7 +2165,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -2152,7 +2181,11 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." description: Template for Kafka Connect Build `Pods`. The build pod is used only on Kubernetes. buildContainer: type: object @@ -2355,128 +2388,22 @@ spec: description: Metadata applied to the resource. description: Template for Secret of the Kafka Connect Cluster JMX authentication. description: "Template for Kafka Connect and Kafka MirrorMaker 2 resources. The template allows users to specify how the `Pods`, `Service`, and other services are generated." - externalConfiguration: - type: object - properties: - env: - type: array - items: - type: object - properties: - name: - type: string - description: Name of the environment variable which will be passed to the Kafka Connect pods. The name of the environment variable cannot start with `KAFKA_` or `STRIMZI_`. - valueFrom: - type: object - properties: - secretKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a Secret. - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a ConfigMap. - oneOf: - - properties: - secretKeyRef: {} - required: - - secretKeyRef - - properties: - configMapKeyRef: {} - required: - - configMapKeyRef - description: Value of the environment variable which will be passed to the Kafka Connect pods. It can be passed either as a reference to Secret or ConfigMap field. The field has to specify exactly one Secret or ConfigMap. - required: - - name - - valueFrom - description: Makes data from a Secret or ConfigMap available in the Kafka Connect pods as environment variables. - volumes: - type: array - items: - type: object - properties: - name: - type: string - description: Name of the volume which will be added to the Kafka Connect pods. - secret: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - optional: - type: boolean - secretName: - type: string - description: Reference to a key in a Secret. Exactly one Secret or ConfigMap has to be specified. - configMap: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a ConfigMap. Exactly one Secret or ConfigMap has to be specified. - oneOf: - - properties: - secret: {} - required: - - secret - - properties: - configMap: {} - required: - - configMap - required: - - name - description: Makes data from a Secret or ConfigMap available in the Kafka Connect pods as volumes. - description: Pass data from Secrets or ConfigMaps to the Kafka Connect pods and use them to configure connectors. build: type: object properties: output: type: object properties: - additionalKanikoOptions: + additionalBuildOptions: type: array items: type: string - description: "Configures additional options which will be passed to the Kaniko executor when building the new Connect image. Allowed options are: --customPlatform, --custom-platform, --insecure, --insecure-pull, --insecure-registry, --log-format, --log-timestamp, --registry-mirror, --reproducible, --single-snapshot, --skip-tls-verify, --skip-tls-verify-pull, --skip-tls-verify-registry, --verbosity, --snapshotMode, --use-new-run, --registry-certificate, --registry-client-cert, --ignore-path. These options will be used only on Kubernetes where the Kaniko executor is used. They will be ignored on OpenShift. The options are described in the link:https://github.com/GoogleContainerTools/kaniko[Kaniko GitHub repository^]. Changing this field does not trigger new build of the Kafka Connect image." + description: "Configures additional options to pass to the `build` command of either Kaniko or Buildah (depending on the feature gate setting) when building a new Kafka Connect image. Allowed Kaniko options: --customPlatform, --custom-platform, --insecure, --insecure-pull, --insecure-registry, --log-format, --log-timestamp, --registry-mirror, --reproducible, --single-snapshot, --skip-tls-verify, --skip-tls-verify-pull, --skip-tls-verify-registry, --verbosity, --snapshotMode, --use-new-run, --registry-certificate, --registry-client-cert, --ignore-path. Allowed Buildah `build` options: --authfile, --cert-dir, --creds, --decryption-key, --retry, --retry-delay, --tls-verify. Those options are used only on Kubernetes, where Kaniko and Buildah are available. They are ignored on OpenShift. For more information, see the link:https://github.com/GoogleContainerTools/kaniko[Kaniko GitHub repository^] or the link:https://github.com/containers/buildah/blob/main/docs/buildah-build.1.md[Buildah build document^]. Changing this field does not trigger a rebuild of the Kafka Connect image." + additionalPushOptions: + type: array + items: + type: string + description: "Configures additional options to pass to the Buildah `push` command when pushing a new Connect image. Allowed options: --authfile, --cert-dir, --creds, --quiet, --retry, --retry-delay, --tls-verify. Those options are used only on Kubernetes, where Buildah is available. They are ignored on OpenShift. For more information, see the link:https://github.com/containers/buildah/blob/main/docs/buildah-push.1.md[Buildah push document^]. Changing this field does not trigger a rebuild of the Kafka Connect image." image: type: string description: The name of the image which will be built. Required. @@ -2516,9 +2443,29 @@ spec: group: type: string description: Maven group id. Applicable to the `maven` artifact type only. + includeScope: + type: string + enum: + - compile + - provided + - runtime + - test + - system + description: "Maven scope for including dependencies for the artifact. Valid values are `compile`, `provided`, `runtime`, `test`, and `system`. When not configured, no scope is set, and all dependencies are included. Applicable to the `maven` artifact type only." insecure: type: boolean description: "By default, connections using TLS are verified to check they are secure. The server certificate used must be valid, trusted, and contain the server name. By setting this option to `true`, all TLS verification is disabled and the artifact will be downloaded, even when the server is considered insecure." + mirrors: + type: array + items: + type: object + properties: + url: + type: string + description: "The URL of the Maven mirror. All repository requests during the build, including plugin repositories and Maven Central, are redirected to this mirror. Applicable to the `maven` artifact type only." + required: + - url + description: "List of Maven mirrors used to download the artifact and its dependencies. All repository requests during the build, including plugin repositories and Maven Central, are redirected to the configured mirror(s). Applicable to the `maven` artifact type only." repository: type: string description: Maven repository to download the artifact from. Applicable to the `maven` artifact type only. @@ -2581,8 +2528,55 @@ spec: - output - plugins description: Configures how the Connect container image should be built. Optional. + plugins: + type: array + items: + type: object + properties: + name: + type: string + pattern: "^[a-z0-9][-_a-z0-9]*[a-z0-9]$" + description: "A unique name for the connector plugin. This name is used to generate the mount path for the connector artifacts. The name has to be unique within the KafkaConnect resource. The name must be unique within the `KafkaConnect` resource and match the pattern: `^[a-z][-_a-z0-9]*[a-z]$`. Required." + artifacts: + type: array + items: + type: object + properties: + pullPolicy: + type: string + description: |- + Policy that determines when the container image (OCI artifact) is pulled. + + Possible values are: + + * `Always`: Always pull the image. If the pull fails, container creation fails. + * `Never`: Never pull the image. Use only a locally available image. Container creation fails if the image isn’t present. + * `IfNotPresent`: Pull the image only if it’s not already available locally. Container creation fails if the image isn’t present and the pull fails. + + Defaults to `Always` if `:latest` tag is specified, or `IfNotPresent` otherwise. + reference: + type: string + description: Reference to the container image (OCI artifact) containing the Kafka Connect plugin. The image is mounted as a volume and provides the plugin binary. Required. + type: + type: string + enum: + - image + description: "Artifact type. Currently, the only supported artifact type is `image`." + required: + - reference + - type + description: List of artifacts associated with this connector plugin. Required. + required: + - name + - artifacts + description: List of connector plugins to mount into the `KafkaConnect` pod. required: + - replicas - bootstrapServers + - groupId + - configStorageTopic + - statusStorageTopic + - offsetStorageTopic description: The specification of the Kafka Connect cluster. status: type: object @@ -2636,3 +2630,5 @@ spec: type: string description: Label selector for pods providing this resource. description: The status of the Kafka Connect cluster. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/042-Crd-strimzipodset.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/042-Crd-strimzipodset.yaml index 4832407aa..4e4547738 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/042-Crd-strimzipodset.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/042-Crd-strimzipodset.yaml @@ -21,7 +21,7 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: @@ -126,3 +126,5 @@ spec: type: integer description: Number of pods managed by this `StrimziPodSet` resource that have the current revision. description: The status of the StrimziPodSet. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/043-Crd-kafkatopic.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/043-Crd-kafkatopic.yaml index 2f84c462a..7957e1cf4 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/043-Crd-kafkatopic.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/043-Crd-kafkatopic.yaml @@ -21,7 +21,7 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: @@ -128,217 +128,5 @@ spec: description: The session identifier for replicas change requests pertaining to this KafkaTopic resource. This is used by the Topic Operator to track the status of `ongoing` replicas change operations. description: Replication factor change status. description: The status of the topic. - - name: v1beta1 - served: true - storage: false - subresources: - status: {} - additionalPrinterColumns: - - name: Cluster - description: The name of the Kafka cluster this topic belongs to - jsonPath: .metadata.labels.strimzi\.io/cluster - type: string - - name: Partitions - description: The desired number of partitions in the topic - jsonPath: .spec.partitions - type: integer - - name: Replication factor - description: The desired number of replicas of each partition - jsonPath: .spec.replicas - type: integer - - name: Ready - description: The state of the custom resource - jsonPath: ".status.conditions[?(@.type==\"Ready\")].status" - type: string - schema: - openAPIV3Schema: - type: object - properties: - apiVersion: - type: string - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - kind: - type: string - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - metadata: - type: object - spec: - type: object - properties: - topicName: - type: string - description: The name of the topic. When absent this will default to the metadata.name of the topic. It is recommended to not set this unless the topic name is not a valid Kubernetes resource name. - partitions: - type: integer - minimum: 1 - description: "The number of partitions the topic should have. This cannot be decreased after topic creation. It can be increased after topic creation, but it is important to understand the consequences that has, especially for topics with semantic partitioning. When absent this will default to the broker configuration for `num.partitions`." - replicas: - type: integer - minimum: 1 - maximum: 32767 - description: The number of replicas the topic should have. When absent this will default to the broker configuration for `default.replication.factor`. - config: - x-kubernetes-preserve-unknown-fields: true - type: object - description: The topic configuration. - description: The specification of the topic. - status: - type: object - properties: - conditions: - type: array - items: - type: object - properties: - type: - type: string - description: "The unique identifier of a condition, used to distinguish between other conditions in the resource." - status: - type: string - description: "The status of the condition, either True, False or Unknown." - lastTransitionTime: - type: string - description: "Last time the condition of a type changed from one status to another. The required format is 'yyyy-MM-ddTHH:mm:ssZ', in the UTC time zone." - reason: - type: string - description: The reason for the condition's last transition (a single word in CamelCase). - message: - type: string - description: Human-readable message indicating details about the condition's last transition. - description: List of status conditions. - observedGeneration: - type: integer - description: The generation of the CRD that was last reconciled by the operator. - topicName: - type: string - description: Topic name. - topicId: - type: string - description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name." - replicasChange: - type: object - properties: - targetReplicas: - type: integer - description: The target replicas value requested by the user. This may be different from .spec.replicas when a change is ongoing. - state: - type: string - enum: - - pending - - ongoing - description: "Current state of the replicas change operation. This can be `pending`, when the change has been requested, or `ongoing`, when the change has been successfully submitted to Cruise Control." - message: - type: string - description: Message for the user related to the replicas change request. This may contain transient error messages that would disappear on periodic reconciliations. - sessionId: - type: string - description: The session identifier for replicas change requests pertaining to this KafkaTopic resource. This is used by the Topic Operator to track the status of `ongoing` replicas change operations. - description: Replication factor change status. - description: The status of the topic. - - name: v1alpha1 - served: true - storage: false - subresources: - status: {} - additionalPrinterColumns: - - name: Cluster - description: The name of the Kafka cluster this topic belongs to - jsonPath: .metadata.labels.strimzi\.io/cluster - type: string - - name: Partitions - description: The desired number of partitions in the topic - jsonPath: .spec.partitions - type: integer - - name: Replication factor - description: The desired number of replicas of each partition - jsonPath: .spec.replicas - type: integer - - name: Ready - description: The state of the custom resource - jsonPath: ".status.conditions[?(@.type==\"Ready\")].status" - type: string - schema: - openAPIV3Schema: - type: object - properties: - apiVersion: - type: string - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - kind: - type: string - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - metadata: - type: object - spec: - type: object - properties: - topicName: - type: string - description: The name of the topic. When absent this will default to the metadata.name of the topic. It is recommended to not set this unless the topic name is not a valid Kubernetes resource name. - partitions: - type: integer - minimum: 1 - description: "The number of partitions the topic should have. This cannot be decreased after topic creation. It can be increased after topic creation, but it is important to understand the consequences that has, especially for topics with semantic partitioning. When absent this will default to the broker configuration for `num.partitions`." - replicas: - type: integer - minimum: 1 - maximum: 32767 - description: The number of replicas the topic should have. When absent this will default to the broker configuration for `default.replication.factor`. - config: - x-kubernetes-preserve-unknown-fields: true - type: object - description: The topic configuration. - description: The specification of the topic. - status: - type: object - properties: - conditions: - type: array - items: - type: object - properties: - type: - type: string - description: "The unique identifier of a condition, used to distinguish between other conditions in the resource." - status: - type: string - description: "The status of the condition, either True, False or Unknown." - lastTransitionTime: - type: string - description: "Last time the condition of a type changed from one status to another. The required format is 'yyyy-MM-ddTHH:mm:ssZ', in the UTC time zone." - reason: - type: string - description: The reason for the condition's last transition (a single word in CamelCase). - message: - type: string - description: Human-readable message indicating details about the condition's last transition. - description: List of status conditions. - observedGeneration: - type: integer - description: The generation of the CRD that was last reconciled by the operator. - topicName: - type: string - description: Topic name. - topicId: - type: string - description: "The topic's id. For a KafkaTopic with the ready condition, this will change only if the topic gets deleted and recreated with the same name." - replicasChange: - type: object - properties: - targetReplicas: - type: integer - description: The target replicas value requested by the user. This may be different from .spec.replicas when a change is ongoing. - state: - type: string - enum: - - pending - - ongoing - description: "Current state of the replicas change operation. This can be `pending`, when the change has been requested, or `ongoing`, when the change has been successfully submitted to Cruise Control." - message: - type: string - description: Message for the user related to the replicas change request. This may contain transient error messages that would disappear on periodic reconciliations. - sessionId: - type: string - description: The session identifier for replicas change requests pertaining to this KafkaTopic resource. This is used by the Topic Operator to track the status of `ongoing` replicas change operations. - description: Replication factor change status. - description: The status of the topic. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml index 9f015abf2..a2b43c1cb 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/044-Crd-kafkauser.yaml @@ -21,7 +21,7 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: @@ -81,6 +81,10 @@ spec: required: - valueFrom description: "Specify the password for the user. If not set, a new password is generated by the User Operator." + renewalDays: + type: integer + minimum: 1 + description: "Number of days before certificate expiration when the user certificate is renewed. Both this property and `validityDays` must be configured together.The value must be greater than 0 and less than `validityDays`.If not configured, the Clients CA configuration is used." type: type: string enum: @@ -88,9 +92,20 @@ spec: - tls-external - scram-sha-512 description: Authentication type. + validityDays: + type: integer + minimum: 1 + description: "Number of days for which the user certificate is valid. Both this property and `renewalDays` must be configured together.The value must be greater than 0 and greater than `renewalDays`.If not configured, the Clients CA configuration is used." required: - type description: "Authentication mechanism enabled for this Kafka user. The supported authentication mechanisms are `scram-sha-512`, `tls`, and `tls-external`. \n\n* `scram-sha-512` generates a secret with SASL SCRAM-SHA-512 credentials.\n* `tls` generates a secret with user certificate for mutual TLS authentication.\n* `tls-external` does not generate a user certificate. But prepares the user for using mutual TLS authentication using a user certificate generated outside the User Operator.\n ACLs and quotas set for this user are configured in the `CN=` format.\n\nAuthentication is optional. If authentication is not configured, no credentials are generated. ACLs and quotas set for the user are configured in the `` format suitable for SASL authentication." + x-kubernetes-validations: + - rule: self.type == 'tls' || (!has(self.validityDays) && !has(self.renewalDays)) + message: "'validityDays' and 'renewalDays' can be configured only with 'type: tls'" + - rule: self.type != 'tls' || (has(self.renewalDays) == has(self.validityDays)) + message: "Both 'validityDays' and 'renewalDays' must be set together, or both must be unset." + - rule: self.type != 'tls' || !has(self.renewalDays) || !has(self.validityDays) || self.renewalDays < self.validityDays + message: '''renewalDays'' must be less than ''validityDays''.' authorization: type: object properties: @@ -104,7 +119,7 @@ spec: enum: - allow - deny - description: The type of the rule. Currently the only supported type is `allow`. ACL rules with type `allow` are used to allow user to execute the specified operations. Default value is `allow`. + description: The type of the rule. ACL rules with type `allow` are used to allow user to execute the specified operations. ACL rules with type `deny` are used to deny user to execute the specified operations. Default value is `allow`. resource: type: object properties: @@ -131,21 +146,6 @@ spec: host: type: string description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host." - operation: - type: string - enum: - - Read - - Write - - Create - - Delete - - Alter - - Describe - - ClusterAction - - AlterConfigs - - DescribeConfigs - - IdempotentWrite - - All - description: "Operation which will be allowed or denied. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All." operations: type: array items: @@ -165,6 +165,7 @@ spec: description: "List of operations to allow or deny. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All. Only certain operations work with the specified resource." required: - resource + - operations description: List of ACL rules which should be applied to this user. type: type: string @@ -194,469 +195,7 @@ spec: type: number minimum: 0 description: "A quota on the rate at which mutations are accepted for the create topics request, the create partitions request and the delete topics request. The rate is accumulated by the number of partitions created or deleted." - description: Quotas on requests to control the broker resources used by clients. Network bandwidth and request rate quotas can be enforced.Kafka documentation for Kafka User quotas can be found at http://kafka.apache.org/documentation/#design_quotas. - template: - type: object - properties: - secret: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - description: Template for KafkaUser resources. The template allows users to specify how the `Secret` with password or TLS certificates is generated. - description: Template to specify how Kafka User `Secrets` are generated. - description: The specification of the user. - status: - type: object - properties: - conditions: - type: array - items: - type: object - properties: - type: - type: string - description: "The unique identifier of a condition, used to distinguish between other conditions in the resource." - status: - type: string - description: "The status of the condition, either True, False or Unknown." - lastTransitionTime: - type: string - description: "Last time the condition of a type changed from one status to another. The required format is 'yyyy-MM-ddTHH:mm:ssZ', in the UTC time zone." - reason: - type: string - description: The reason for the condition's last transition (a single word in CamelCase). - message: - type: string - description: Human-readable message indicating details about the condition's last transition. - description: List of status conditions. - observedGeneration: - type: integer - description: The generation of the CRD that was last reconciled by the operator. - username: - type: string - description: Username. - secret: - type: string - description: The name of `Secret` where the credentials are stored. - description: The status of the Kafka User. - - name: v1beta1 - served: true - storage: false - subresources: - status: {} - additionalPrinterColumns: - - name: Cluster - description: The name of the Kafka cluster this user belongs to - jsonPath: .metadata.labels.strimzi\.io/cluster - type: string - - name: Authentication - description: How the user is authenticated - jsonPath: .spec.authentication.type - type: string - - name: Authorization - description: How the user is authorised - jsonPath: .spec.authorization.type - type: string - - name: Ready - description: The state of the custom resource - jsonPath: ".status.conditions[?(@.type==\"Ready\")].status" - type: string - schema: - openAPIV3Schema: - type: object - properties: - apiVersion: - type: string - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - kind: - type: string - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - metadata: - type: object - spec: - type: object - properties: - authentication: - type: object - properties: - password: - type: object - properties: - valueFrom: - type: object - properties: - secretKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Selects a key of a Secret in the resource's namespace. - description: Secret from which the password should be read. - required: - - valueFrom - description: "Specify the password for the user. If not set, a new password is generated by the User Operator." - type: - type: string - enum: - - tls - - tls-external - - scram-sha-512 - description: Authentication type. - required: - - type - description: "Authentication mechanism enabled for this Kafka user. The supported authentication mechanisms are `scram-sha-512`, `tls`, and `tls-external`. \n\n* `scram-sha-512` generates a secret with SASL SCRAM-SHA-512 credentials.\n* `tls` generates a secret with user certificate for mutual TLS authentication.\n* `tls-external` does not generate a user certificate. But prepares the user for using mutual TLS authentication using a user certificate generated outside the User Operator.\n ACLs and quotas set for this user are configured in the `CN=` format.\n\nAuthentication is optional. If authentication is not configured, no credentials are generated. ACLs and quotas set for the user are configured in the `` format suitable for SASL authentication." - authorization: - type: object - properties: - acls: - type: array - items: - type: object - properties: - type: - type: string - enum: - - allow - - deny - description: The type of the rule. Currently the only supported type is `allow`. ACL rules with type `allow` are used to allow user to execute the specified operations. Default value is `allow`. - resource: - type: object - properties: - name: - type: string - description: Name of resource for which given ACL rule applies. Can be combined with `patternType` field to use prefix pattern. - patternType: - type: string - enum: - - literal - - prefix - description: "Describes the pattern used in the resource field. The supported types are `literal` and `prefix`. With `literal` pattern type, the resource field will be used as a definition of a full name. With `prefix` pattern type, the resource name will be used only as a prefix. Default value is `literal`." - type: - type: string - enum: - - topic - - group - - cluster - - transactionalId - description: "Resource type. The available resource types are `topic`, `group`, `cluster`, and `transactionalId`." - required: - - type - description: Indicates the resource for which given ACL rule applies. - host: - type: string - description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host." - operation: - type: string - enum: - - Read - - Write - - Create - - Delete - - Alter - - Describe - - ClusterAction - - AlterConfigs - - DescribeConfigs - - IdempotentWrite - - All - description: "Operation which will be allowed or denied. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All." - operations: - type: array - items: - type: string - enum: - - Read - - Write - - Create - - Delete - - Alter - - Describe - - ClusterAction - - AlterConfigs - - DescribeConfigs - - IdempotentWrite - - All - description: "List of operations to allow or deny. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All. Only certain operations work with the specified resource." - required: - - resource - description: List of ACL rules which should be applied to this user. - type: - type: string - enum: - - simple - description: Authorization type. Currently the only supported type is `simple`. `simple` authorization type uses the Kafka Admin API for managing the ACL rules. - required: - - acls - - type - description: Authorization rules for this Kafka user. - quotas: - type: object - properties: - producerByteRate: - type: integer - minimum: 0 - description: A quota on the maximum bytes per-second that each client group can publish to a broker before the clients in the group are throttled. Defined on a per-broker basis. - consumerByteRate: - type: integer - minimum: 0 - description: A quota on the maximum bytes per-second that each client group can fetch from a broker before the clients in the group are throttled. Defined on a per-broker basis. - requestPercentage: - type: integer - minimum: 0 - description: A quota on the maximum CPU utilization of each client group as a percentage of network and I/O threads. - controllerMutationRate: - type: number - minimum: 0 - description: "A quota on the rate at which mutations are accepted for the create topics request, the create partitions request and the delete topics request. The rate is accumulated by the number of partitions created or deleted." - description: Quotas on requests to control the broker resources used by clients. Network bandwidth and request rate quotas can be enforced.Kafka documentation for Kafka User quotas can be found at http://kafka.apache.org/documentation/#design_quotas. - template: - type: object - properties: - secret: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - description: Template for KafkaUser resources. The template allows users to specify how the `Secret` with password or TLS certificates is generated. - description: Template to specify how Kafka User `Secrets` are generated. - description: The specification of the user. - status: - type: object - properties: - conditions: - type: array - items: - type: object - properties: - type: - type: string - description: "The unique identifier of a condition, used to distinguish between other conditions in the resource." - status: - type: string - description: "The status of the condition, either True, False or Unknown." - lastTransitionTime: - type: string - description: "Last time the condition of a type changed from one status to another. The required format is 'yyyy-MM-ddTHH:mm:ssZ', in the UTC time zone." - reason: - type: string - description: The reason for the condition's last transition (a single word in CamelCase). - message: - type: string - description: Human-readable message indicating details about the condition's last transition. - description: List of status conditions. - observedGeneration: - type: integer - description: The generation of the CRD that was last reconciled by the operator. - username: - type: string - description: Username. - secret: - type: string - description: The name of `Secret` where the credentials are stored. - description: The status of the Kafka User. - - name: v1alpha1 - served: true - storage: false - subresources: - status: {} - additionalPrinterColumns: - - name: Cluster - description: The name of the Kafka cluster this user belongs to - jsonPath: .metadata.labels.strimzi\.io/cluster - type: string - - name: Authentication - description: How the user is authenticated - jsonPath: .spec.authentication.type - type: string - - name: Authorization - description: How the user is authorised - jsonPath: .spec.authorization.type - type: string - - name: Ready - description: The state of the custom resource - jsonPath: ".status.conditions[?(@.type==\"Ready\")].status" - type: string - schema: - openAPIV3Schema: - type: object - properties: - apiVersion: - type: string - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - kind: - type: string - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - metadata: - type: object - spec: - type: object - properties: - authentication: - type: object - properties: - password: - type: object - properties: - valueFrom: - type: object - properties: - secretKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Selects a key of a Secret in the resource's namespace. - description: Secret from which the password should be read. - required: - - valueFrom - description: "Specify the password for the user. If not set, a new password is generated by the User Operator." - type: - type: string - enum: - - tls - - tls-external - - scram-sha-512 - description: Authentication type. - required: - - type - description: "Authentication mechanism enabled for this Kafka user. The supported authentication mechanisms are `scram-sha-512`, `tls`, and `tls-external`. \n\n* `scram-sha-512` generates a secret with SASL SCRAM-SHA-512 credentials.\n* `tls` generates a secret with user certificate for mutual TLS authentication.\n* `tls-external` does not generate a user certificate. But prepares the user for using mutual TLS authentication using a user certificate generated outside the User Operator.\n ACLs and quotas set for this user are configured in the `CN=` format.\n\nAuthentication is optional. If authentication is not configured, no credentials are generated. ACLs and quotas set for the user are configured in the `` format suitable for SASL authentication." - authorization: - type: object - properties: - acls: - type: array - items: - type: object - properties: - type: - type: string - enum: - - allow - - deny - description: The type of the rule. Currently the only supported type is `allow`. ACL rules with type `allow` are used to allow user to execute the specified operations. Default value is `allow`. - resource: - type: object - properties: - name: - type: string - description: Name of resource for which given ACL rule applies. Can be combined with `patternType` field to use prefix pattern. - patternType: - type: string - enum: - - literal - - prefix - description: "Describes the pattern used in the resource field. The supported types are `literal` and `prefix`. With `literal` pattern type, the resource field will be used as a definition of a full name. With `prefix` pattern type, the resource name will be used only as a prefix. Default value is `literal`." - type: - type: string - enum: - - topic - - group - - cluster - - transactionalId - description: "Resource type. The available resource types are `topic`, `group`, `cluster`, and `transactionalId`." - required: - - type - description: Indicates the resource for which given ACL rule applies. - host: - type: string - description: "The host from which the action described in the ACL rule is allowed or denied. If not set, it defaults to `*`, allowing or denying the action from any host." - operation: - type: string - enum: - - Read - - Write - - Create - - Delete - - Alter - - Describe - - ClusterAction - - AlterConfigs - - DescribeConfigs - - IdempotentWrite - - All - description: "Operation which will be allowed or denied. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All." - operations: - type: array - items: - type: string - enum: - - Read - - Write - - Create - - Delete - - Alter - - Describe - - ClusterAction - - AlterConfigs - - DescribeConfigs - - IdempotentWrite - - All - description: "List of operations to allow or deny. Supported operations are: Read, Write, Create, Delete, Alter, Describe, ClusterAction, AlterConfigs, DescribeConfigs, IdempotentWrite and All. Only certain operations work with the specified resource." - required: - - resource - description: List of ACL rules which should be applied to this user. - type: - type: string - enum: - - simple - description: Authorization type. Currently the only supported type is `simple`. `simple` authorization type uses the Kafka Admin API for managing the ACL rules. - required: - - acls - - type - description: Authorization rules for this Kafka user. - quotas: - type: object - properties: - producerByteRate: - type: integer - minimum: 0 - description: A quota on the maximum bytes per-second that each client group can publish to a broker before the clients in the group are throttled. Defined on a per-broker basis. - consumerByteRate: - type: integer - minimum: 0 - description: A quota on the maximum bytes per-second that each client group can fetch from a broker before the clients in the group are throttled. Defined on a per-broker basis. - requestPercentage: - type: integer - minimum: 0 - description: A quota on the maximum CPU utilization of each client group as a percentage of network and I/O threads. - controllerMutationRate: - type: number - minimum: 0 - description: "A quota on the rate at which mutations are accepted for the create topics request, the create partitions request and the delete topics request. The rate is accumulated by the number of partitions created or deleted." - description: Quotas on requests to control the broker resources used by clients. Network bandwidth and request rate quotas can be enforced.Kafka documentation for Kafka User quotas can be found at http://kafka.apache.org/documentation/#design_quotas. + description: "Quotas on requests to control the broker resources used by clients. Network bandwidth and request rate quotas can be enforced. For more information, see the Apache Kafka design documentation about quotas." template: type: object properties: @@ -714,3 +253,5 @@ spec: type: string description: The name of `Secret` where the credentials are stored. description: The status of the Kafka User. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/045-Crd-kafkamirrormaker.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/045-Crd-kafkamirrormaker.yaml deleted file mode 100644 index c8248d7cc..000000000 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/045-Crd-kafkamirrormaker.yaml +++ /dev/null @@ -1,1584 +0,0 @@ -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - name: kafkamirrormakers.kafka.strimzi.io - labels: - app: strimzi - strimzi.io/crd-install: "true" - component: kafkamirrormakers.kafka.strimzi.io-crd -spec: - group: kafka.strimzi.io - names: - kind: KafkaMirrorMaker - listKind: KafkaMirrorMakerList - singular: kafkamirrormaker - plural: kafkamirrormakers - shortNames: - - kmm - categories: - - strimzi - scope: Namespaced - conversion: - strategy: None - versions: - - name: v1beta2 - served: true - storage: true - subresources: - status: {} - scale: - specReplicasPath: .spec.replicas - statusReplicasPath: .status.replicas - labelSelectorPath: .status.labelSelector - additionalPrinterColumns: - - name: Desired replicas - description: The desired number of Kafka MirrorMaker replicas - jsonPath: .spec.replicas - type: integer - - name: Consumer Bootstrap Servers - description: The boostrap servers for the consumer - jsonPath: .spec.consumer.bootstrapServers - type: string - priority: 1 - - name: Producer Bootstrap Servers - description: The boostrap servers for the producer - jsonPath: .spec.producer.bootstrapServers - type: string - priority: 1 - - name: Ready - description: The state of the custom resource - jsonPath: ".status.conditions[?(@.type==\"Ready\")].status" - type: string - schema: - openAPIV3Schema: - type: object - properties: - apiVersion: - type: string - description: "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources" - kind: - type: string - description: "Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds" - metadata: - type: object - spec: - type: object - properties: - version: - type: string - description: The Kafka MirrorMaker version. Defaults to the latest version. Consult the documentation to understand the process required to upgrade or downgrade the version. - replicas: - type: integer - minimum: 0 - description: The number of pods in the `Deployment`. - image: - type: string - description: "The container image used for Kafka MirrorMaker pods. If no image name is explicitly specified, it is determined based on the `spec.version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration." - consumer: - type: object - properties: - numStreams: - type: integer - minimum: 1 - description: Specifies the number of consumer stream threads to create. - offsetCommitInterval: - type: integer - description: Specifies the offset auto-commit interval in ms. Default value is 60000. - bootstrapServers: - type: string - description: A list of host:port pairs for establishing the initial connection to the Kafka cluster. - groupId: - type: string - description: A unique string that identifies the consumer group this consumer belongs to. - authentication: - type: object - properties: - accessToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the access token which was obtained from the authorization server. - accessTokenIsJwt: - type: boolean - description: Configure whether access token should be treated as JWT. This should be set to `false` if the authorization server returns opaque tokens. Defaults to `true`. - accessTokenLocation: - type: string - description: Path to the token file containing an access token to be used for authentication. - audience: - type: string - description: "OAuth audience to use when authenticating against the authorization server. Some authorization servers require the audience to be explicitly set. The possible values depend on how the authorization server is configured. By default, `audience` is not specified when performing the token endpoint request." - certificateAndKey: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the Secret. - key: - type: string - description: The name of the private key in the Secret. - required: - - secretName - - certificate - - key - description: Reference to the `Secret` which holds the certificate and private key pair. - clientAssertion: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes secret containing the client assertion which was manually configured for the client. - clientAssertionLocation: - type: string - description: Path to the file containing the client assertion to be used for authentication. - clientAssertionType: - type: string - description: "The client assertion type. If not set, and either `clientAssertion` or `clientAssertionLocation` is configured, this value defaults to `urn:ietf:params:oauth:client-assertion-type:jwt-bearer`." - clientId: - type: string - description: OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - clientSecret: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the OAuth client secret which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - connectTimeoutSeconds: - type: integer - description: "The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds." - disableTlsHostnameVerification: - type: boolean - description: Enable or disable TLS hostname verification. Default value is `false`. - enableMetrics: - type: boolean - description: Enable or disable OAuth metrics. Default value is `false`. - httpRetries: - type: integer - description: "The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries." - httpRetryPauseMs: - type: integer - description: "The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request." - includeAcceptHeader: - type: boolean - description: Whether the Accept header should be set in requests to the authorization servers. The default value is `true`. - maxTokenExpirySeconds: - type: integer - description: Set or limit time-to-live of the access tokens to the specified number of seconds. This should be set if the authorization server returns opaque tokens. - passwordSecret: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the password. - password: - type: string - description: The name of the key in the Secret under which the password is stored. - required: - - secretName - - password - description: Reference to the `Secret` which holds the password. - readTimeoutSeconds: - type: integer - description: "The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds." - refreshToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the refresh token which can be used to obtain access token from the authorization server. - saslExtensions: - additionalProperties: - type: string - type: object - description: SASL extensions parameters. - scope: - type: string - description: OAuth scope to use when authenticating against the authorization server. Some authorization servers require this to be set. The possible values depend on how authorization server is configured. By default `scope` is not specified when doing the token endpoint request. - tlsTrustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection to the OAuth server. - tokenEndpointUri: - type: string - description: Authorization server token endpoint URI. - type: - type: string - enum: - - tls - - scram-sha-256 - - scram-sha-512 - - plain - - oauth - description: "Authentication type. Currently the supported types are `tls`, `scram-sha-256`, `scram-sha-512`, `plain`, and 'oauth'. `scram-sha-256` and `scram-sha-512` types use SASL SCRAM-SHA-256 and SASL SCRAM-SHA-512 Authentication, respectively. `plain` type uses SASL PLAIN Authentication. `oauth` type uses SASL OAUTHBEARER Authentication. The `tls` type uses TLS Client Authentication. The `tls` type is supported only over TLS connections." - username: - type: string - description: Username used for the authentication. - required: - - type - description: Authentication configuration for connecting to the cluster. - tls: - type: object - properties: - trustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection. - description: TLS configuration for connecting MirrorMaker to the cluster. - config: - x-kubernetes-preserve-unknown-fields: true - type: object - description: "The MirrorMaker consumer config. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, group.id, sasl., security., interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols)." - required: - - bootstrapServers - - groupId - description: Configuration of source cluster. - producer: - type: object - properties: - bootstrapServers: - type: string - description: A list of host:port pairs for establishing the initial connection to the Kafka cluster. - abortOnSendFailure: - type: boolean - description: Flag to set the MirrorMaker to exit on a failed send. Default value is `true`. - authentication: - type: object - properties: - accessToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the access token which was obtained from the authorization server. - accessTokenIsJwt: - type: boolean - description: Configure whether access token should be treated as JWT. This should be set to `false` if the authorization server returns opaque tokens. Defaults to `true`. - accessTokenLocation: - type: string - description: Path to the token file containing an access token to be used for authentication. - audience: - type: string - description: "OAuth audience to use when authenticating against the authorization server. Some authorization servers require the audience to be explicitly set. The possible values depend on how the authorization server is configured. By default, `audience` is not specified when performing the token endpoint request." - certificateAndKey: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the Secret. - key: - type: string - description: The name of the private key in the Secret. - required: - - secretName - - certificate - - key - description: Reference to the `Secret` which holds the certificate and private key pair. - clientAssertion: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes secret containing the client assertion which was manually configured for the client. - clientAssertionLocation: - type: string - description: Path to the file containing the client assertion to be used for authentication. - clientAssertionType: - type: string - description: "The client assertion type. If not set, and either `clientAssertion` or `clientAssertionLocation` is configured, this value defaults to `urn:ietf:params:oauth:client-assertion-type:jwt-bearer`." - clientId: - type: string - description: OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - clientSecret: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the OAuth client secret which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - connectTimeoutSeconds: - type: integer - description: "The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds." - disableTlsHostnameVerification: - type: boolean - description: Enable or disable TLS hostname verification. Default value is `false`. - enableMetrics: - type: boolean - description: Enable or disable OAuth metrics. Default value is `false`. - httpRetries: - type: integer - description: "The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries." - httpRetryPauseMs: - type: integer - description: "The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request." - includeAcceptHeader: - type: boolean - description: Whether the Accept header should be set in requests to the authorization servers. The default value is `true`. - maxTokenExpirySeconds: - type: integer - description: Set or limit time-to-live of the access tokens to the specified number of seconds. This should be set if the authorization server returns opaque tokens. - passwordSecret: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the password. - password: - type: string - description: The name of the key in the Secret under which the password is stored. - required: - - secretName - - password - description: Reference to the `Secret` which holds the password. - readTimeoutSeconds: - type: integer - description: "The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds." - refreshToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the refresh token which can be used to obtain access token from the authorization server. - saslExtensions: - additionalProperties: - type: string - type: object - description: SASL extensions parameters. - scope: - type: string - description: OAuth scope to use when authenticating against the authorization server. Some authorization servers require this to be set. The possible values depend on how authorization server is configured. By default `scope` is not specified when doing the token endpoint request. - tlsTrustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection to the OAuth server. - tokenEndpointUri: - type: string - description: Authorization server token endpoint URI. - type: - type: string - enum: - - tls - - scram-sha-256 - - scram-sha-512 - - plain - - oauth - description: "Authentication type. Currently the supported types are `tls`, `scram-sha-256`, `scram-sha-512`, `plain`, and 'oauth'. `scram-sha-256` and `scram-sha-512` types use SASL SCRAM-SHA-256 and SASL SCRAM-SHA-512 Authentication, respectively. `plain` type uses SASL PLAIN Authentication. `oauth` type uses SASL OAUTHBEARER Authentication. The `tls` type uses TLS Client Authentication. The `tls` type is supported only over TLS connections." - username: - type: string - description: Username used for the authentication. - required: - - type - description: Authentication configuration for connecting to the cluster. - config: - x-kubernetes-preserve-unknown-fields: true - type: object - description: "The MirrorMaker producer config. Properties with the following prefixes cannot be set: ssl., bootstrap.servers, sasl., security., interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols)." - tls: - type: object - properties: - trustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection. - description: TLS configuration for connecting MirrorMaker to the cluster. - required: - - bootstrapServers - description: Configuration of target cluster. - resources: - type: object - properties: - claims: - type: array - items: - type: object - properties: - name: - type: string - request: - type: string - limits: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - requests: - additionalProperties: - anyOf: - - type: integer - - type: string - pattern: "^(\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\\+|-)?(([0-9]+(\\.[0-9]*)?)|(\\.[0-9]+))))?$" - x-kubernetes-int-or-string: true - type: object - description: CPU and memory resources to reserve. - whitelist: - type: string - description: "List of topics which are included for mirroring. This option allows any regular expression using Java-style regular expressions. Mirroring two topics named A and B is achieved by using the expression `A\\|B`. Or, as a special case, you can mirror all topics using the regular expression `*`. You can also specify multiple regular expressions separated by commas." - include: - type: string - description: "List of topics which are included for mirroring. This option allows any regular expression using Java-style regular expressions. Mirroring two topics named A and B is achieved by using the expression `A\\|B`. Or, as a special case, you can mirror all topics using the regular expression `*`. You can also specify multiple regular expressions separated by commas." - jvmOptions: - type: object - properties: - "-XX": - additionalProperties: - type: string - type: object - description: A map of -XX options to the JVM. - "-Xmx": - type: string - pattern: "^[0-9]+[mMgG]?$" - description: -Xmx option to to the JVM. - "-Xms": - type: string - pattern: "^[0-9]+[mMgG]?$" - description: -Xms option to to the JVM. - gcLoggingEnabled: - type: boolean - description: Specifies whether the Garbage Collection logging is enabled. The default is false. - javaSystemProperties: - type: array - items: - type: object - properties: - name: - type: string - description: The system property name. - value: - type: string - description: The system property value. - description: A map of additional system properties which will be passed using the `-D` option to the JVM. - description: JVM Options for pods. - logging: - type: object - properties: - loggers: - additionalProperties: - type: string - type: object - description: A Map from logger name to logger level. - type: - type: string - enum: - - inline - - external - description: "Logging type, must be either 'inline' or 'external'." - valueFrom: - type: object - properties: - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to the key in the ConfigMap containing the configuration. - description: '`ConfigMap` entry where the logging configuration is stored. ' - required: - - type - description: Logging configuration for MirrorMaker. - metricsConfig: - type: object - properties: - type: - type: string - enum: - - jmxPrometheusExporter - description: Metrics type. Only 'jmxPrometheusExporter' supported currently. - valueFrom: - type: object - properties: - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to the key in the ConfigMap containing the configuration. - description: 'ConfigMap entry where the Prometheus JMX Exporter configuration is stored. ' - required: - - type - - valueFrom - description: Metrics configuration. - tracing: - type: object - properties: - type: - type: string - enum: - - jaeger - - opentelemetry - description: "Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. As of Strimzi 0.37.0, `jaeger` type is not supported anymore and this option is ignored." - required: - - type - description: The configuration of tracing in Kafka MirrorMaker. - template: - type: object - properties: - deployment: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - deploymentStrategy: - type: string - enum: - - RollingUpdate - - Recreate - description: Pod replacement strategy for deployment configuration changes. Valid values are `RollingUpdate` and `Recreate`. Defaults to `RollingUpdate`. - description: Template for Kafka MirrorMaker `Deployment`. - pod: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - imagePullSecrets: - type: array - items: - type: object - properties: - name: - type: string - description: "List of references to secrets in the same namespace to use for pulling any of the images used by this Pod. When the `STRIMZI_IMAGE_PULL_SECRETS` environment variable in Cluster Operator and the `imagePullSecrets` option are specified, only the `imagePullSecrets` variable is used and the `STRIMZI_IMAGE_PULL_SECRETS` variable is ignored." - securityContext: - type: object - properties: - appArmorProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - fsGroup: - type: integer - fsGroupChangePolicy: - type: string - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - runAsUser: - type: integer - seLinuxChangePolicy: - type: string - seLinuxOptions: - type: object - properties: - level: - type: string - role: - type: string - type: - type: string - user: - type: string - seccompProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - supplementalGroups: - type: array - items: - type: integer - supplementalGroupsPolicy: - type: string - sysctls: - type: array - items: - type: object - properties: - name: - type: string - value: - type: string - windowsOptions: - type: object - properties: - gmsaCredentialSpec: - type: string - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - runAsUserName: - type: string - description: Configures pod-level security attributes and common container settings. - terminationGracePeriodSeconds: - type: integer - minimum: 0 - description: "The grace period is the duration in seconds after the processes running in the pod are sent a termination signal, and the time when the processes are forcibly halted with a kill signal. Set this value to longer than the expected cleanup time for your process. Value must be a non-negative integer. A zero value indicates delete immediately. You might need to increase the grace period for very large Kafka clusters, so that the Kafka brokers have enough time to transfer their work to another broker before they are terminated. Defaults to 30 seconds." - affinity: - type: object - properties: - nodeAffinity: - type: object - properties: - preferredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - preference: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchFields: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - weight: - type: integer - requiredDuringSchedulingIgnoredDuringExecution: - type: object - properties: - nodeSelectorTerms: - type: array - items: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchFields: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - podAffinity: - type: object - properties: - preferredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - podAffinityTerm: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - weight: - type: integer - requiredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - podAntiAffinity: - type: object - properties: - preferredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - podAffinityTerm: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - weight: - type: integer - requiredDuringSchedulingIgnoredDuringExecution: - type: array - items: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - mismatchLabelKeys: - type: array - items: - type: string - namespaceSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - namespaces: - type: array - items: - type: string - topologyKey: - type: string - description: The pod's affinity rules. - tolerations: - type: array - items: - type: object - properties: - effect: - type: string - key: - type: string - operator: - type: string - tolerationSeconds: - type: integer - value: - type: string - description: The pod's tolerations. - topologySpreadConstraints: - type: array - items: - type: object - properties: - labelSelector: - type: object - properties: - matchExpressions: - type: array - items: - type: object - properties: - key: - type: string - operator: - type: string - values: - type: array - items: - type: string - matchLabels: - additionalProperties: - type: string - type: object - matchLabelKeys: - type: array - items: - type: string - maxSkew: - type: integer - minDomains: - type: integer - nodeAffinityPolicy: - type: string - nodeTaintsPolicy: - type: string - topologyKey: - type: string - whenUnsatisfiable: - type: string - description: The pod's topology spread constraints. - priorityClassName: - type: string - description: 'The name of the priority class used to assign priority to the pods. ' - schedulerName: - type: string - description: "The name of the scheduler used to dispatch this `Pod`. If not specified, the default scheduler will be used." - hostAliases: - type: array - items: - type: object - properties: - hostnames: - type: array - items: - type: string - ip: - type: string - description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. - enableServiceLinks: - type: boolean - description: Indicates whether information about services should be injected into Pod's environment variables. - tmpDirSizeLimit: - type: string - pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" - description: "Defines the total amount of pod memory allocated for the temporary `EmptyDir` volume `/tmp`. Specify the allocation in memory units, for example, `100Mi` for 100 mebibytes. Default value is `5Mi`. The `/tmp` volume is backed by pod memory, not disk storage, so avoid setting a high value as it consumes pod memory resources." - volumes: - type: array - items: - type: object - properties: - name: - type: string - description: Name to use for the volume. Required. - secret: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - optional: - type: boolean - secretName: - type: string - description: Secret to use populate the volume. - configMap: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - name: - type: string - optional: - type: boolean - description: ConfigMap to use to populate the volume. - emptyDir: - type: object - properties: - medium: - type: string - sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. - persistentVolumeClaim: - type: object - properties: - claimName: - type: string - readOnly: - type: boolean - description: PersistentVolumeClaim object to use to populate the volume. - csi: - type: object - properties: - driver: - type: string - fsType: - type: string - nodePublishSecretRef: - type: object - properties: - name: - type: string - readOnly: - type: boolean - volumeAttributes: - additionalProperties: - type: string - type: object - description: CSIVolumeSource object to use to populate the volume. - oneOf: - - properties: - secret: {} - configMap: {} - emptyDir: {} - persistentVolumeClaim: {} - csi: {} - description: Additional volumes that can be mounted to the pod. - description: Template for Kafka MirrorMaker `Pods`. - podDisruptionBudget: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata to apply to the `PodDisruptionBudgetTemplate` resource. - maxUnavailable: - type: integer - minimum: 0 - description: "Maximum number of unavailable pods to allow automatic Pod eviction. A Pod eviction is allowed when the `maxUnavailable` number of pods or fewer are unavailable after the eviction. Setting this value to 0 prevents all voluntary evictions, so the pods must be evicted manually. Defaults to 1." - description: Template for Kafka MirrorMaker `PodDisruptionBudget`. - mirrorMakerContainer: - type: object - properties: - env: - type: array - items: - type: object - properties: - name: - type: string - description: The environment variable key. - value: - type: string - description: The environment variable value. - valueFrom: - type: object - properties: - secretKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a secret. - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a config map. - oneOf: - - properties: - secretKeyRef: {} - required: - - secretKeyRef - - properties: - configMapKeyRef: {} - required: - - configMapKeyRef - description: Reference to the secret or config map property to which the environment variable is set. - oneOf: - - properties: - value: {} - required: - - value - - properties: - valueFrom: {} - required: - - valueFrom - description: Environment variables which should be applied to the container. - securityContext: - type: object - properties: - allowPrivilegeEscalation: - type: boolean - appArmorProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - capabilities: - type: object - properties: - add: - type: array - items: - type: string - drop: - type: array - items: - type: string - privileged: - type: boolean - procMount: - type: string - readOnlyRootFilesystem: - type: boolean - runAsGroup: - type: integer - runAsNonRoot: - type: boolean - runAsUser: - type: integer - seLinuxOptions: - type: object - properties: - level: - type: string - role: - type: string - type: - type: string - user: - type: string - seccompProfile: - type: object - properties: - localhostProfile: - type: string - type: - type: string - windowsOptions: - type: object - properties: - gmsaCredentialSpec: - type: string - gmsaCredentialSpecName: - type: string - hostProcess: - type: boolean - runAsUserName: - type: string - description: Security context for the container. - volumeMounts: - type: array - items: - type: object - properties: - mountPath: - type: string - mountPropagation: - type: string - name: - type: string - readOnly: - type: boolean - recursiveReadOnly: - type: string - subPath: - type: string - subPathExpr: - type: string - description: Additional volume mounts which should be applied to the container. - description: Template for Kafka MirrorMaker container. - serviceAccount: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - description: Template for the Kafka MirrorMaker service account. - description: "Template to specify how Kafka MirrorMaker resources, `Deployments` and `Pods`, are generated." - livenessProbe: - type: object - properties: - initialDelaySeconds: - type: integer - minimum: 0 - description: The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0. - timeoutSeconds: - type: integer - minimum: 1 - description: The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1. - periodSeconds: - type: integer - minimum: 1 - description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. - successThreshold: - type: integer - minimum: 1 - description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1. - failureThreshold: - type: integer - minimum: 1 - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. - description: Pod liveness checking. - readinessProbe: - type: object - properties: - initialDelaySeconds: - type: integer - minimum: 0 - description: The initial delay before first the health is first checked. Default to 15 seconds. Minimum value is 0. - timeoutSeconds: - type: integer - minimum: 1 - description: The timeout for each attempted health check. Default to 5 seconds. Minimum value is 1. - periodSeconds: - type: integer - minimum: 1 - description: How often (in seconds) to perform the probe. Default to 10 seconds. Minimum value is 1. - successThreshold: - type: integer - minimum: 1 - description: Minimum consecutive successes for the probe to be considered successful after having failed. Defaults to 1. Must be 1 for liveness. Minimum value is 1. - failureThreshold: - type: integer - minimum: 1 - description: Minimum consecutive failures for the probe to be considered failed after having succeeded. Defaults to 3. Minimum value is 1. - description: Pod readiness checking. - oneOf: - - properties: - include: {} - required: - - include - - properties: - whitelist: {} - required: - - whitelist - required: - - replicas - - consumer - - producer - description: The specification of Kafka MirrorMaker. - status: - type: object - properties: - conditions: - type: array - items: - type: object - properties: - type: - type: string - description: "The unique identifier of a condition, used to distinguish between other conditions in the resource." - status: - type: string - description: "The status of the condition, either True, False or Unknown." - lastTransitionTime: - type: string - description: "Last time the condition of a type changed from one status to another. The required format is 'yyyy-MM-ddTHH:mm:ssZ', in the UTC time zone." - reason: - type: string - description: The reason for the condition's last transition (a single word in CamelCase). - message: - type: string - description: Human-readable message indicating details about the condition's last transition. - description: List of status conditions. - observedGeneration: - type: integer - description: The generation of the CRD that was last reconciled by the operator. - labelSelector: - type: string - description: Label selector for pods providing this resource. - replicas: - type: integer - description: The current number of pods being used to provide this resource. - description: The status of Kafka MirrorMaker. diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/04A-Crd-kafkanodepool.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/045-Crd-kafkanodepool.yaml similarity index 88% rename from packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/04A-Crd-kafkanodepool.yaml rename to packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/045-Crd-kafkanodepool.yaml index 445411c27..25e729af2 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/04A-Crd-kafkanodepool.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/045-Crd-kafkanodepool.yaml @@ -21,7 +21,7 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: @@ -70,7 +70,7 @@ spec: description: The storage class to use for dynamic volume allocation. deleteClaim: type: boolean - description: Specifies if the persistent volume claim has to be deleted when the cluster is un-deployed. + description: Specifies whether the persistent volume claim is deleted when a Kafka node is deleted. Optional. Defaults to `false`. id: type: integer minimum: 0 @@ -80,18 +80,6 @@ spec: enum: - shared description: "Specifies whether this volume should be used for storing KRaft metadata. This property is optional. When set, the only currently supported value is `shared`. At most one volume can have this property set." - overrides: - type: array - items: - type: object - properties: - class: - type: string - description: The storage class to use for dynamic volume allocation for this broker. - broker: - type: integer - description: Id of the kafka broker (broker identifier). - description: Overrides for individual brokers. The `overrides` field allows you to specify a different configuration for different brokers. selector: additionalProperties: type: string @@ -111,6 +99,9 @@ spec: - persistent-claim - jbod description: "Storage type, must be either 'ephemeral', 'persistent-claim', or 'jbod'." + volumeAttributesClass: + type: string + description: Specifies `VolumeAttributeClass` name for dynamically configuring storage attributes. volumes: type: array items: @@ -121,7 +112,7 @@ spec: description: The storage class to use for dynamic volume allocation. deleteClaim: type: boolean - description: Specifies if the persistent volume claim has to be deleted when the cluster is un-deployed. + description: Specifies whether the persistent volume claim is deleted when a Kafka node is deleted. Optional. Defaults to `false`. id: type: integer minimum: 0 @@ -131,18 +122,6 @@ spec: enum: - shared description: "Specifies whether this volume should be used for storing KRaft metadata. This property is optional. When set, the only currently supported value is `shared`. At most one volume can have this property set." - overrides: - type: array - items: - type: object - properties: - class: - type: string - description: The storage class to use for dynamic volume allocation for this broker. - broker: - type: integer - description: Id of the kafka broker (broker identifier). - description: Overrides for individual brokers. The `overrides` field allows you to specify a different configuration for different brokers. selector: additionalProperties: type: string @@ -161,6 +140,9 @@ spec: - ephemeral - persistent-claim description: "Storage type, must be either 'ephemeral' or 'persistent-claim'." + volumeAttributesClass: + type: string + description: Specifies `VolumeAttributeClass` name for dynamically configuring storage attributes. required: - type description: List of volumes as Storage objects representing the JBOD disks array. @@ -174,7 +156,7 @@ spec: enum: - controller - broker - description: "The roles that the nodes in this pool will have when KRaft mode is enabled. Supported values are 'broker' and 'controller'. This field is required. When KRaft mode is disabled, the only allowed value if `broker`." + description: The roles assigned to the node pool. Supported values are `broker` and `controller`. This property is required. resources: type: object properties: @@ -758,6 +740,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -793,7 +804,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -814,20 +825,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -835,7 +846,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -854,7 +865,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -862,7 +881,75 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. + templatedVolumes: + type: array + items: + type: object + properties: + name: + type: string + description: Name to use for the volume. Required. + secret: + type: object + properties: + defaultMode: + type: integer + items: + type: array + items: + type: object + properties: + key: + type: string + mode: + type: integer + path: + type: string + optional: + type: boolean + secretName: + type: string + description: "`Secret` to use to populate the volume. The name of the Secret and the items key and path fields can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + configMap: + type: object + properties: + defaultMode: + type: integer + items: + type: array + items: + type: object + properties: + key: + type: string + mode: + type: integer + path: + type: string + name: + type: string + optional: + type: boolean + description: "`ConfigMap` to use to populate the volume. The name of the ConfigMap and the items key and path fields can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + persistentVolumeClaim: + type: object + properties: + claimName: + type: string + readOnly: + type: boolean + description: "`PersistentVolumeClaim` object to use to populate the volume. The name of the Persistent Volume Claim can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + oneOf: + - properties: + secret: {} + configMap: {} + persistentVolumeClaim: {} + description: Additional volumes that can be mounted to the pod. These volumes can use templates to mount different volumes into individual Pods. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." description: Template for Kafka `Pods`. perPodService: type: object @@ -1278,3 +1365,5 @@ spec: type: string description: Label selector for pods providing this resource. description: The status of the KafkaNodePool. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/046-Crd-kafkabridge.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/046-Crd-kafkabridge.yaml index b4c0dfcca..f54a5a0ff 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/046-Crd-kafkabridge.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/046-Crd-kafkabridge.yaml @@ -21,7 +21,7 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: @@ -62,10 +62,10 @@ spec: replicas: type: integer minimum: 0 - description: The number of pods in the `Deployment`. Defaults to `1`. + description: The number of pods in the `Deployment`. Required in the `v1` version of the Strimzi API. image: type: string - description: "The container image used for Kafka Bridge pods. If no image name is explicitly specified, the image name corresponds to the image specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used." + description: "The container image used for HTTP Bridge pods. If no image name is explicitly specified, the image name corresponds to the image specified in the Cluster Operator configuration. If an image name is not defined in the Cluster Operator configuration, a default value is used." bootstrapServers: type: string description: A list of host:port pairs for establishing the initial connection to the Kafka cluster. @@ -98,32 +98,10 @@ spec: required: - secretName description: Trusted certificates for TLS connection. - description: TLS configuration for connecting Kafka Bridge to the cluster. + description: TLS configuration for connecting HTTP Bridge to the cluster. authentication: type: object properties: - accessToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the access token which was obtained from the authorization server. - accessTokenIsJwt: - type: boolean - description: Configure whether access token should be treated as JWT. This should be set to `false` if the authorization server returns opaque tokens. Defaults to `true`. - accessTokenLocation: - type: string - description: Path to the token file containing an access token to be used for authentication. - audience: - type: string - description: "OAuth audience to use when authenticating against the authorization server. Some authorization servers require the audience to be explicitly set. The possible values depend on how the authorization server is configured. By default, `audience` is not specified when performing the token endpoint request." certificateAndKey: type: object properties: @@ -135,68 +113,16 @@ spec: description: The name of the file certificate in the Secret. key: type: string - description: The name of the private key in the Secret. + description: "The name of the private key in the secret. The private key must be in unencrypted PKCS #8 format. For more information, see RFC 5208: https://datatracker.ietf.org/doc/html/rfc5208." required: - secretName - certificate - key description: Reference to the `Secret` which holds the certificate and private key pair. - clientAssertion: + config: + x-kubernetes-preserve-unknown-fields: true type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes secret containing the client assertion which was manually configured for the client. - clientAssertionLocation: - type: string - description: Path to the file containing the client assertion to be used for authentication. - clientAssertionType: - type: string - description: "The client assertion type. If not set, and either `clientAssertion` or `clientAssertionLocation` is configured, this value defaults to `urn:ietf:params:oauth:client-assertion-type:jwt-bearer`." - clientId: - type: string - description: OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - clientSecret: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the OAuth client secret which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - connectTimeoutSeconds: - type: integer - description: "The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds." - disableTlsHostnameVerification: - type: boolean - description: Enable or disable TLS hostname verification. Default value is `false`. - enableMetrics: - type: boolean - description: Enable or disable OAuth metrics. Default value is `false`. - httpRetries: - type: integer - description: "The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries." - httpRetryPauseMs: - type: integer - description: "The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request." - includeAcceptHeader: - type: boolean - description: Whether the Accept header should be set in requests to the authorization servers. The default value is `true`. - maxTokenExpirySeconds: - type: integer - description: Set or limit time-to-live of the access tokens to the specified number of seconds. This should be set if the authorization server returns opaque tokens. + description: Configuration for the custom authentication mechanism. Only properties with the `sasl.` and `ssl.keystore.` prefixes are allowed. Specify other options in the regular configuration section of the custom resource. passwordSecret: type: object properties: @@ -210,59 +136,9 @@ spec: - secretName - password description: Reference to the `Secret` which holds the password. - readTimeoutSeconds: - type: integer - description: "The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds." - refreshToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the refresh token which can be used to obtain access token from the authorization server. - saslExtensions: - additionalProperties: - type: string - type: object - description: SASL extensions parameters. - scope: - type: string - description: OAuth scope to use when authenticating against the authorization server. Some authorization servers require this to be set. The possible values depend on how authorization server is configured. By default `scope` is not specified when doing the token endpoint request. - tlsTrustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection to the OAuth server. - tokenEndpointUri: - type: string - description: Authorization server token endpoint URI. + sasl: + type: boolean + description: Enable or disable SASL on this authentication mechanism. type: type: string enum: @@ -270,8 +146,8 @@ spec: - scram-sha-256 - scram-sha-512 - plain - - oauth - description: "Authentication type. Currently the supported types are `tls`, `scram-sha-256`, `scram-sha-512`, `plain`, and 'oauth'. `scram-sha-256` and `scram-sha-512` types use SASL SCRAM-SHA-256 and SASL SCRAM-SHA-512 Authentication, respectively. `plain` type uses SASL PLAIN Authentication. `oauth` type uses SASL OAUTHBEARER Authentication. The `tls` type uses TLS Client Authentication. The `tls` type is supported only over TLS connections." + - custom + description: "Specifies the authentication type. Supported types are `tls`, `scram-sha-256`, `scram-sha-512`, `plain`, and `custom`. `tls` uses TLS client authentication and is supported only over TLS connections. `scram-sha-256` and `scram-sha-512` use SASL SCRAM-SHA-256 and SASL SCRAM-SHA-512 authentication, respectively. `plain` uses SASL PLAIN authentication. `custom` allows you to configure a custom authentication mechanism." username: type: string description: Username used for the authentication. @@ -284,7 +160,34 @@ spec: port: type: integer minimum: 1023 - description: The port which is the server listening on. + description: Port the server listens on. + tls: + type: object + properties: + certificateAndKey: + type: object + properties: + secretName: + type: string + description: The name of the Secret containing the certificate. + certificate: + type: string + description: The name of the file certificate in the Secret. + key: + type: string + description: "The name of the private key in the secret. The private key must be in unencrypted PKCS #8 format. For more information, see RFC 5208: https://datatracker.ietf.org/doc/html/rfc5208." + required: + - secretName + - certificate + - key + description: Reference to the `Secret` which holds the certificate and private key pair. + config: + x-kubernetes-preserve-unknown-fields: true + type: object + description: "Additional configuration for the HTTP server TLS. Properties with the following prefixes cannot be set: ssl. (with the exception of: ssl.enabled.cipher.suites, ssl.enabled.protocols)." + required: + - certificateAndKey + description: TLS configuration for clients connections to the HTTP Bridge. cors: type: object properties: @@ -396,7 +299,7 @@ spec: type: string description: The system property value. description: A map of additional system properties which will be passed using the `-D` option to the JVM. - description: '**Currently not supported** JVM Options for pods.' + description: JVM Options for pods. logging: type: object properties: @@ -427,23 +330,70 @@ spec: description: '`ConfigMap` entry where the logging configuration is stored. ' required: - type - description: Logging configuration for Kafka Bridge. + description: Logging configuration for HTTP Bridge. clientRackInitImage: type: string description: The image of the init container used for initializing the `client.rack`. rack: type: object properties: + envVarName: + type: string + description: The name of the environment variable that defines the rack ID. Its value sets the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect or MirrorMaker 2. topologyKey: type: string example: topology.kubernetes.io/zone description: "A key that matches labels assigned to the Kubernetes cluster nodes. The value of the label is used to set a broker's `broker.rack` config, and the `client.rack` config for Kafka Connect or MirrorMaker 2." - required: - - topologyKey + type: + type: string + enum: + - topology-label + - environment-variable + description: "Specifies the rack awareness type. Supported types are `topology-label` and `environment-variable`. `topology-label` uses a Kubernetes worker node label to set the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect and MirrorMaker 2. `environment-variable` uses an environment variable to set the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect and MirrorMaker 2. When not specified, `topology-label` type is used by default." description: Configuration of the node label which will be used as the client.rack consumer configuration. - enableMetrics: - type: boolean - description: Enable the metrics for the Kafka Bridge. Default is false. + x-kubernetes-validations: + - rule: (has(self.type) && self.type != "topology-label") || self.topologyKey != "" + message: topologyKey property is required + - rule: has(self.type) == false || self.type != "environment-variable" || self.envVarName != "" + message: envVarName property is required + metricsConfig: + type: object + properties: + type: + type: string + enum: + - jmxPrometheusExporter + - strimziMetricsReporter + description: Metrics type. The supported types are `jmxPrometheusExporter` and `strimziMetricsReporter`. Type `jmxPrometheusExporter` uses the Prometheus JMX Exporter to expose Kafka JMX metrics in Prometheus format through an HTTP endpoint. Type `strimziMetricsReporter` uses the Strimzi Metrics Reporter to directly expose Kafka metrics in Prometheus format through an HTTP endpoint. + valueFrom: + type: object + properties: + configMapKeyRef: + type: object + properties: + key: + type: string + name: + type: string + optional: + type: boolean + description: Reference to the key in the ConfigMap containing the configuration. + description: ConfigMap entry where the Prometheus JMX Exporter configuration is stored. + values: + type: object + properties: + allowList: + type: array + items: + type: string + description: A list of regex patterns to filter the metrics to collect. Should contain at least one element. + description: Configuration values for the Strimzi Metrics Reporter. + required: + - type + description: Metrics configuration. + x-kubernetes-validations: + - rule: self.type != 'jmxPrometheusExporter' || has(self.valueFrom) + message: valueFrom property is required livenessProbe: type: object properties: @@ -518,7 +468,7 @@ spec: - RollingUpdate - Recreate description: Pod replacement strategy for deployment configuration changes. Valid values are `RollingUpdate` and `Recreate`. Defaults to `RollingUpdate`. - description: Template for Kafka Bridge `Deployment`. + description: Template for HTTP Bridge `Deployment`. pod: type: object properties: @@ -1020,6 +970,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -1055,7 +1034,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -1076,20 +1055,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -1097,7 +1076,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -1116,7 +1095,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -1124,8 +1111,12 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. - description: Template for Kafka Bridge `Pods`. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." + description: Template for HTTP Bridge `Pods`. apiService: type: object properties: @@ -1158,7 +1149,7 @@ spec: - IPv4 - IPv6 description: "Specifies the IP Families used by the service. Available options are `IPv4` and `IPv6`. If unspecified, Kubernetes will choose the default value based on the `ipFamilyPolicy` setting." - description: Template for Kafka Bridge API `Service`. + description: Template for HTTP Bridge API `Service`. podDisruptionBudget: type: object properties: @@ -1180,7 +1171,7 @@ spec: type: integer minimum: 0 description: "Maximum number of unavailable pods to allow automatic Pod eviction. A Pod eviction is allowed when the `maxUnavailable` number of pods or fewer are unavailable after the eviction. Setting this value to 0 prevents all voluntary evictions, so the pods must be evicted manually. Defaults to 1." - description: Template for Kafka Bridge `PodDisruptionBudget`. + description: Template for HTTP Bridge `PodDisruptionBudget`. bridgeContainer: type: object properties: @@ -1323,7 +1314,7 @@ spec: subPathExpr: type: string description: Additional volume mounts which should be applied to the container. - description: Template for the Kafka Bridge container. + description: Template for the HTTP Bridge container. clusterRoleBinding: type: object properties: @@ -1341,7 +1332,7 @@ spec: type: object description: Annotations added to the Kubernetes resource. description: Metadata applied to the resource. - description: Template for the Kafka Bridge ClusterRoleBinding. + description: Template for the HTTP Bridge ClusterRoleBinding. serviceAccount: type: object properties: @@ -1359,7 +1350,7 @@ spec: type: object description: Annotations added to the Kubernetes resource. description: Metadata applied to the resource. - description: Template for the Kafka Bridge service account. + description: Template for the HTTP Bridge service account. initContainer: type: object properties: @@ -1502,23 +1493,27 @@ spec: subPathExpr: type: string description: Additional volume mounts which should be applied to the container. - description: Template for the Kafka Bridge init container. - description: Template for Kafka Bridge resources. The template allows users to specify how a `Deployment` and `Pod` is generated. + description: Template for the HTTP Bridge init container. + description: Template for HTTP Bridge resources. The template allows users to specify how a `Deployment` and `Pod` is generated. tracing: type: object properties: type: type: string enum: - - jaeger - opentelemetry - description: "Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. As of Strimzi 0.37.0, `jaeger` type is not supported anymore and this option is ignored." + description: Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. required: - type - description: The configuration of tracing in Kafka Bridge. + description: The configuration of tracing in HTTP Bridge. + config: + x-kubernetes-preserve-unknown-fields: true + type: object + description: "Additional configuration for the HTTP bridge. The following prefixes cannot be set: kafka., http., bridge.metrics. The following options cannot be set: bridge.id, bridge.tracing, bridge.metrics." required: + - replicas - bootstrapServers - description: The specification of the Kafka Bridge. + description: The specification of the HTTP Bridge. status: type: object properties: @@ -1548,11 +1543,13 @@ spec: description: The generation of the CRD that was last reconciled by the operator. url: type: string - description: The URL at which external client applications can access the Kafka Bridge. + description: The URL at which external client applications can access the HTTP Bridge. replicas: type: integer description: The current number of pods being used to provide this resource. labelSelector: type: string description: Label selector for pods providing this resource. - description: The status of the Kafka Bridge. + description: The status of the HTTP Bridge. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/047-Crd-kafkaconnector.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/047-Crd-kafkaconnector.yaml index 25a8b74a9..bd50cf772 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/047-Crd-kafkaconnector.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/047-Crd-kafkaconnector.yaml @@ -21,7 +21,7 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: @@ -78,13 +78,13 @@ spec: type: integer description: "The maximum number of connector restarts that the operator will try. If the connector remains in a failed state after reaching this limit, it must be restarted manually by the user. Defaults to an unlimited number of restarts." description: Automatic restart of connector and tasks configuration. + version: + type: string + description: Desired version or version range to respect when starting the Kafka Connector. This is only supported when using Kafka Connect version 4.1.0 and higher. config: x-kubernetes-preserve-unknown-fields: true type: object - description: "The Kafka Connector configuration. The following properties cannot be set: name, connector.class, tasks.max." - pause: - type: boolean - description: Whether the connector should be paused. Defaults to false. + description: "The Kafka Connector configuration. The following properties cannot be set: name, connector.class, tasks.max, connector.plugin.version." state: type: string enum: @@ -170,3 +170,5 @@ spec: type: string description: The list of topics used by the Kafka Connector. description: The status of the Kafka Connector. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/048-Crd-kafkamirrormaker2.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/048-Crd-kafkamirrormaker2.yaml index 0ffe03902..b3c0c57f6 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/048-Crd-kafkamirrormaker2.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/048-Crd-kafkamirrormaker2.yaml @@ -21,7 +21,7 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: @@ -59,81 +59,38 @@ spec: description: The Kafka Connect version. Defaults to the latest version. Consult the user documentation to understand the process required to upgrade or downgrade the version. replicas: type: integer - description: The number of pods in the Kafka Connect group. Defaults to `3`. + description: The number of pods in the Kafka Connect group. Required in the `v1` version of the Strimzi API. image: type: string description: "The container image used for Kafka Connect pods. If no image name is explicitly specified, it is determined based on the `spec.version` configuration. The image names are specifically mapped to corresponding versions in the Cluster Operator configuration." - connectCluster: - type: string - description: The cluster alias used for Kafka Connect. The value must match the alias of the *target* Kafka cluster as specified in the `spec.clusters` configuration. The target Kafka cluster is used by the underlying Kafka Connect framework for its internal topics. - clusters: - type: array - items: - type: object - properties: - alias: - type: string - pattern: "^[a-zA-Z0-9\\._\\-]{1,100}$" - description: Alias used to reference the Kafka cluster. - bootstrapServers: - type: string - description: A comma-separated list of `host:port` pairs for establishing the connection to the Kafka cluster. - tls: - type: object - properties: - trustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection. - description: TLS configuration for connecting MirrorMaker 2 connectors to a cluster. - authentication: - type: object - properties: - accessToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the access token which was obtained from the authorization server. - accessTokenIsJwt: - type: boolean - description: Configure whether access token should be treated as JWT. This should be set to `false` if the authorization server returns opaque tokens. Defaults to `true`. - accessTokenLocation: - type: string - description: Path to the token file containing an access token to be used for authentication. - audience: - type: string - description: "OAuth audience to use when authenticating against the authorization server. Some authorization servers require the audience to be explicitly set. The possible values depend on how the authorization server is configured. By default, `audience` is not specified when performing the token endpoint request." - certificateAndKey: + target: + type: object + properties: + alias: + type: string + pattern: "^[a-zA-Z0-9\\._\\-]{1,100}$" + description: Alias used to reference the Kafka cluster. + bootstrapServers: + type: string + description: A comma-separated list of `host:port` pairs for establishing the connection to the Kafka cluster. + groupId: + type: string + description: A unique ID that identifies the Connect cluster group. Required. + configStorageTopic: + type: string + description: The name of the Kafka topic where connector configurations are stored. Required. + statusStorageTopic: + type: string + description: The name of the Kafka topic where connector and task statuses are stored. Required. + offsetStorageTopic: + type: string + description: The name of the Kafka topic where source connector offsets are stored. Required. + tls: + type: object + properties: + trustedCertificates: + type: array + items: type: object properties: secretName: @@ -141,171 +98,198 @@ spec: description: The name of the Secret containing the certificate. certificate: type: string - description: The name of the file certificate in the Secret. - key: + description: The name of the file certificate in the secret. + pattern: type: string - description: The name of the private key in the Secret. + description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." + oneOf: + - properties: + certificate: {} + required: + - certificate + - properties: + pattern: {} + required: + - pattern required: - secretName - - certificate - - key - description: Reference to the `Secret` which holds the certificate and private key pair. - clientAssertion: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes secret containing the client assertion which was manually configured for the client. - clientAssertionLocation: - type: string - description: Path to the file containing the client assertion to be used for authentication. - clientAssertionType: - type: string - description: "The client assertion type. If not set, and either `clientAssertion` or `clientAssertionLocation` is configured, this value defaults to `urn:ietf:params:oauth:client-assertion-type:jwt-bearer`." - clientId: - type: string - description: OAuth Client ID which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - clientSecret: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the OAuth client secret which the Kafka client can use to authenticate against the OAuth server and use the token endpoint URI. - connectTimeoutSeconds: - type: integer - description: "The connect timeout in seconds when connecting to authorization server. If not set, the effective connect timeout is 60 seconds." - disableTlsHostnameVerification: - type: boolean - description: Enable or disable TLS hostname verification. Default value is `false`. - enableMetrics: - type: boolean - description: Enable or disable OAuth metrics. Default value is `false`. - httpRetries: - type: integer - description: "The maximum number of retries to attempt if an initial HTTP request fails. If not set, the default is to not attempt any retries." - httpRetryPauseMs: - type: integer - description: "The pause to take before retrying a failed HTTP request. If not set, the default is to not pause at all but to immediately repeat a request." - includeAcceptHeader: - type: boolean - description: Whether the Accept header should be set in requests to the authorization servers. The default value is `true`. - maxTokenExpirySeconds: - type: integer - description: Set or limit time-to-live of the access tokens to the specified number of seconds. This should be set if the authorization server returns opaque tokens. - passwordSecret: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the password. - password: - type: string - description: The name of the key in the Secret under which the password is stored. - required: - - secretName - - password - description: Reference to the `Secret` which holds the password. - readTimeoutSeconds: - type: integer - description: "The read timeout in seconds when connecting to authorization server. If not set, the effective read timeout is 60 seconds." - refreshToken: - type: object - properties: - key: - type: string - description: The key under which the secret value is stored in the Kubernetes Secret. - secretName: - type: string - description: The name of the Kubernetes Secret containing the secret value. - required: - - key - - secretName - description: Link to Kubernetes Secret containing the refresh token which can be used to obtain access token from the authorization server. - saslExtensions: - additionalProperties: + description: Trusted certificates for TLS connection. + description: TLS configuration for connecting MirrorMaker 2 connectors to a cluster. + authentication: + type: object + properties: + certificateAndKey: + type: object + properties: + secretName: type: string - type: object - description: SASL extensions parameters. - scope: - type: string - description: OAuth scope to use when authenticating against the authorization server. Some authorization servers require this to be set. The possible values depend on how authorization server is configured. By default `scope` is not specified when doing the token endpoint request. - tlsTrustedCertificates: - type: array - items: - type: object - properties: - secretName: - type: string - description: The name of the Secret containing the certificate. - certificate: - type: string - description: The name of the file certificate in the secret. - pattern: - type: string - description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." - oneOf: - - properties: - certificate: {} - required: - - certificate - - properties: - pattern: {} - required: - - pattern - required: - - secretName - description: Trusted certificates for TLS connection to the OAuth server. - tokenEndpointUri: - type: string - description: Authorization server token endpoint URI. - type: - type: string - enum: - - tls - - scram-sha-256 - - scram-sha-512 - - plain - - oauth - description: "Authentication type. Currently the supported types are `tls`, `scram-sha-256`, `scram-sha-512`, `plain`, and 'oauth'. `scram-sha-256` and `scram-sha-512` types use SASL SCRAM-SHA-256 and SASL SCRAM-SHA-512 Authentication, respectively. `plain` type uses SASL PLAIN Authentication. `oauth` type uses SASL OAUTHBEARER Authentication. The `tls` type uses TLS Client Authentication. The `tls` type is supported only over TLS connections." - username: - type: string - description: Username used for the authentication. - required: - - type - description: Authentication configuration for connecting to the cluster. - config: - x-kubernetes-preserve-unknown-fields: true - type: object - description: "The MirrorMaker 2 cluster config. Properties with the following prefixes cannot be set: ssl., sasl., security., listeners, plugin.path, rest., bootstrap.servers, consumer.interceptor.classes, producer.interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols)." - required: - - alias - - bootstrapServers - description: Kafka clusters for mirroring. + description: The name of the Secret containing the certificate. + certificate: + type: string + description: The name of the file certificate in the Secret. + key: + type: string + description: "The name of the private key in the secret. The private key must be in unencrypted PKCS #8 format. For more information, see RFC 5208: https://datatracker.ietf.org/doc/html/rfc5208." + required: + - secretName + - certificate + - key + description: Reference to the `Secret` which holds the certificate and private key pair. + config: + x-kubernetes-preserve-unknown-fields: true + type: object + description: Configuration for the custom authentication mechanism. Only properties with the `sasl.` and `ssl.keystore.` prefixes are allowed. Specify other options in the regular configuration section of the custom resource. + passwordSecret: + type: object + properties: + secretName: + type: string + description: The name of the Secret containing the password. + password: + type: string + description: The name of the key in the Secret under which the password is stored. + required: + - secretName + - password + description: Reference to the `Secret` which holds the password. + sasl: + type: boolean + description: Enable or disable SASL on this authentication mechanism. + type: + type: string + enum: + - tls + - scram-sha-256 + - scram-sha-512 + - plain + - custom + description: "Specifies the authentication type. Supported types are `tls`, `scram-sha-256`, `scram-sha-512`, `plain`, and `custom`. `tls` uses TLS client authentication and is supported only over TLS connections. `scram-sha-256` and `scram-sha-512` use SASL SCRAM-SHA-256 and SASL SCRAM-SHA-512 authentication, respectively. `plain` uses SASL PLAIN authentication. `custom` allows you to configure a custom authentication mechanism." + username: + type: string + description: Username used for the authentication. + required: + - type + description: Authentication configuration for connecting to the cluster. + config: + x-kubernetes-preserve-unknown-fields: true + type: object + description: "The MirrorMaker 2 cluster config. Properties with the following prefixes cannot be set: group.id, config.storage.topic, offset.storage.topic, status.storage.topic, ssl., sasl., security., listeners, plugin.path, rest., bootstrap.servers, consumer.interceptor.classes, producer.interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols)." + required: + - alias + - bootstrapServers + - groupId + - configStorageTopic + - statusStorageTopic + - offsetStorageTopic + description: The target Apache Kafka cluster. The target Kafka cluster is used by the underlying Kafka Connect framework for its internal topics. mirrors: type: array items: type: object properties: - sourceCluster: - type: string - description: The alias of the source cluster used by the Kafka MirrorMaker 2 connectors. The alias must match a cluster in the list at `spec.clusters`. - targetCluster: - type: string - description: The alias of the target cluster used by the Kafka MirrorMaker 2 connectors. The alias must match a cluster in the list at `spec.clusters`. + source: + type: object + properties: + alias: + type: string + pattern: "^[a-zA-Z0-9\\._\\-]{1,100}$" + description: Alias used to reference the Kafka cluster. + bootstrapServers: + type: string + description: A comma-separated list of `host:port` pairs for establishing the connection to the Kafka cluster. + tls: + type: object + properties: + trustedCertificates: + type: array + items: + type: object + properties: + secretName: + type: string + description: The name of the Secret containing the certificate. + certificate: + type: string + description: The name of the file certificate in the secret. + pattern: + type: string + description: "Pattern for the certificate files in the secret. Use the link:https://en.wikipedia.org/wiki/Glob_(programming)[_glob syntax_] for the pattern. All files in the secret that match the pattern are used." + oneOf: + - properties: + certificate: {} + required: + - certificate + - properties: + pattern: {} + required: + - pattern + required: + - secretName + description: Trusted certificates for TLS connection. + description: TLS configuration for connecting MirrorMaker 2 connectors to a cluster. + authentication: + type: object + properties: + certificateAndKey: + type: object + properties: + secretName: + type: string + description: The name of the Secret containing the certificate. + certificate: + type: string + description: The name of the file certificate in the Secret. + key: + type: string + description: "The name of the private key in the secret. The private key must be in unencrypted PKCS #8 format. For more information, see RFC 5208: https://datatracker.ietf.org/doc/html/rfc5208." + required: + - secretName + - certificate + - key + description: Reference to the `Secret` which holds the certificate and private key pair. + config: + x-kubernetes-preserve-unknown-fields: true + type: object + description: Configuration for the custom authentication mechanism. Only properties with the `sasl.` and `ssl.keystore.` prefixes are allowed. Specify other options in the regular configuration section of the custom resource. + passwordSecret: + type: object + properties: + secretName: + type: string + description: The name of the Secret containing the password. + password: + type: string + description: The name of the key in the Secret under which the password is stored. + required: + - secretName + - password + description: Reference to the `Secret` which holds the password. + sasl: + type: boolean + description: Enable or disable SASL on this authentication mechanism. + type: + type: string + enum: + - tls + - scram-sha-256 + - scram-sha-512 + - plain + - custom + description: "Specifies the authentication type. Supported types are `tls`, `scram-sha-256`, `scram-sha-512`, `plain`, and `custom`. `tls` uses TLS client authentication and is supported only over TLS connections. `scram-sha-256` and `scram-sha-512` use SASL SCRAM-SHA-256 and SASL SCRAM-SHA-512 authentication, respectively. `plain` uses SASL PLAIN authentication. `custom` allows you to configure a custom authentication mechanism." + username: + type: string + description: Username used for the authentication. + required: + - type + description: Authentication configuration for connecting to the cluster. + config: + x-kubernetes-preserve-unknown-fields: true + type: object + description: "The MirrorMaker 2 cluster config. Properties with the following prefixes cannot be set: group.id, config.storage.topic, offset.storage.topic, status.storage.topic, ssl., sasl., security., listeners, plugin.path, rest., bootstrap.servers, consumer.interceptor.classes, producer.interceptor.classes (with the exception of: ssl.endpoint.identification.algorithm, ssl.cipher.suites, ssl.protocol, ssl.enabled.protocols)." + required: + - alias + - bootstrapServers + description: The source Apache Kafka cluster. The source Kafka cluster is used by the Kafka MirrorMaker 2 connectors. sourceConnector: type: object properties: @@ -313,13 +297,13 @@ spec: type: integer minimum: 1 description: The maximum number of tasks for the Kafka Connector. - pause: - type: boolean - description: Whether the connector should be paused. Defaults to false. + version: + type: string + description: Desired version or version range to respect when starting the Kafka Connector. This is only supported when using Kafka Connect version 4.1.0 and higher. config: x-kubernetes-preserve-unknown-fields: true type: object - description: "The Kafka Connector configuration. The following properties cannot be set: name, connector.class, tasks.max." + description: "The Kafka Connector configuration. The following properties cannot be set: name, connector.class, tasks.max, connector.plugin.version." state: type: string enum: @@ -362,62 +346,6 @@ spec: - fromConfigMap description: Configuration for altering offsets. description: The specification of the Kafka MirrorMaker 2 source connector. - heartbeatConnector: - type: object - properties: - tasksMax: - type: integer - minimum: 1 - description: The maximum number of tasks for the Kafka Connector. - pause: - type: boolean - description: Whether the connector should be paused. Defaults to false. - config: - x-kubernetes-preserve-unknown-fields: true - type: object - description: "The Kafka Connector configuration. The following properties cannot be set: name, connector.class, tasks.max." - state: - type: string - enum: - - paused - - stopped - - running - description: The state the connector should be in. Defaults to running. - autoRestart: - type: object - properties: - enabled: - type: boolean - description: Whether automatic restart for failed connectors and tasks should be enabled or disabled. - maxRestarts: - type: integer - description: "The maximum number of connector restarts that the operator will try. If the connector remains in a failed state after reaching this limit, it must be restarted manually by the user. Defaults to an unlimited number of restarts." - description: Automatic restart of connector and tasks configuration. - listOffsets: - type: object - properties: - toConfigMap: - type: object - properties: - name: - type: string - description: Reference to the ConfigMap where the list of offsets will be written to. - required: - - toConfigMap - description: Configuration for listing offsets. - alterOffsets: - type: object - properties: - fromConfigMap: - type: object - properties: - name: - type: string - description: Reference to the ConfigMap where the new offsets are stored. - required: - - fromConfigMap - description: Configuration for altering offsets. - description: The specification of the Kafka MirrorMaker 2 heartbeat connector. checkpointConnector: type: object properties: @@ -425,13 +353,13 @@ spec: type: integer minimum: 1 description: The maximum number of tasks for the Kafka Connector. - pause: - type: boolean - description: Whether the connector should be paused. Defaults to false. + version: + type: string + description: Desired version or version range to respect when starting the Kafka Connector. This is only supported when using Kafka Connect version 4.1.0 and higher. config: x-kubernetes-preserve-unknown-fields: true type: object - description: "The Kafka Connector configuration. The following properties cannot be set: name, connector.class, tasks.max." + description: "The Kafka Connector configuration. The following properties cannot be set: name, connector.class, tasks.max, connector.plugin.version." state: type: string enum: @@ -477,24 +405,17 @@ spec: topicsPattern: type: string description: "A regular expression matching the topics to be mirrored, for example, \"topic1\\|topic2\\|topic3\". Comma-separated lists are also supported." - topicsBlacklistPattern: - type: string - description: A regular expression matching the topics to exclude from mirroring. Comma-separated lists are also supported. topicsExcludePattern: type: string description: A regular expression matching the topics to exclude from mirroring. Comma-separated lists are also supported. groupsPattern: type: string description: A regular expression matching the consumer groups to be mirrored. Comma-separated lists are also supported. - groupsBlacklistPattern: - type: string - description: A regular expression matching the consumer groups to exclude from mirroring. Comma-separated lists are also supported. groupsExcludePattern: type: string description: A regular expression matching the consumer groups to exclude from mirroring. Comma-separated lists are also supported. required: - - sourceCluster - - targetCluster + - source description: Configuration of the MirrorMaker 2 connectors. resources: type: object @@ -657,13 +578,25 @@ spec: rack: type: object properties: + envVarName: + type: string + description: The name of the environment variable that defines the rack ID. Its value sets the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect or MirrorMaker 2. topologyKey: type: string example: topology.kubernetes.io/zone description: "A key that matches labels assigned to the Kubernetes cluster nodes. The value of the label is used to set a broker's `broker.rack` config, and the `client.rack` config for Kafka Connect or MirrorMaker 2." - required: - - topologyKey + type: + type: string + enum: + - topology-label + - environment-variable + description: "Specifies the rack awareness type. Supported types are `topology-label` and `environment-variable`. `topology-label` uses a Kubernetes worker node label to set the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect and MirrorMaker 2. `environment-variable` uses an environment variable to set the `broker.rack` configuration for Kafka brokers and the `client.rack` configuration for Kafka Connect and MirrorMaker 2. When not specified, `topology-label` type is used by default." description: Configuration of the node label which will be used as the `client.rack` consumer configuration. + x-kubernetes-validations: + - rule: (has(self.type) && self.type != "topology-label") || self.topologyKey != "" + message: topologyKey property is required + - rule: has(self.type) == false || self.type != "environment-variable" || self.envVarName != "" + message: envVarName property is required metricsConfig: type: object properties: @@ -671,7 +604,8 @@ spec: type: string enum: - jmxPrometheusExporter - description: Metrics type. Only 'jmxPrometheusExporter' supported currently. + - strimziMetricsReporter + description: Metrics type. The supported types are `jmxPrometheusExporter` and `strimziMetricsReporter`. Type `jmxPrometheusExporter` uses the Prometheus JMX Exporter to expose Kafka JMX metrics in Prometheus format through an HTTP endpoint. Type `strimziMetricsReporter` uses the Strimzi Metrics Reporter to directly expose Kafka metrics in Prometheus format through an HTTP endpoint. valueFrom: type: object properties: @@ -685,50 +619,36 @@ spec: optional: type: boolean description: Reference to the key in the ConfigMap containing the configuration. - description: 'ConfigMap entry where the Prometheus JMX Exporter configuration is stored. ' + description: ConfigMap entry where the Prometheus JMX Exporter configuration is stored. + values: + type: object + properties: + allowList: + type: array + items: + type: string + description: A list of regex patterns to filter the metrics to collect. Should contain at least one element. + description: Configuration values for the Strimzi Metrics Reporter. required: - type - - valueFrom description: Metrics configuration. + x-kubernetes-validations: + - rule: self.type != 'jmxPrometheusExporter' || has(self.valueFrom) + message: valueFrom property is required tracing: type: object properties: type: type: string enum: - - jaeger - opentelemetry - description: "Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. As of Strimzi 0.37.0, `jaeger` type is not supported anymore and this option is ignored." + description: Type of the tracing used. Currently the only supported type is `opentelemetry` for OpenTelemetry tracing. required: - type description: The configuration of tracing in Kafka Connect. template: type: object properties: - deployment: - type: object - properties: - metadata: - type: object - properties: - labels: - additionalProperties: - type: string - type: object - description: Labels added to the Kubernetes resource. - annotations: - additionalProperties: - type: string - type: object - description: Annotations added to the Kubernetes resource. - description: Metadata applied to the resource. - deploymentStrategy: - type: string - enum: - - RollingUpdate - - Recreate - description: Pod replacement strategy for deployment configuration changes. Valid values are `RollingUpdate` and `Recreate`. Defaults to `RollingUpdate`. - description: Template for Kafka Connect `Deployment`. podSet: type: object properties: @@ -1248,6 +1168,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -1283,7 +1232,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -1304,20 +1253,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -1325,7 +1274,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -1344,7 +1293,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -1352,7 +1309,75 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. + templatedVolumes: + type: array + items: + type: object + properties: + name: + type: string + description: Name to use for the volume. Required. + secret: + type: object + properties: + defaultMode: + type: integer + items: + type: array + items: + type: object + properties: + key: + type: string + mode: + type: integer + path: + type: string + optional: + type: boolean + secretName: + type: string + description: "`Secret` to use to populate the volume. The name of the Secret and the items key and path fields can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + configMap: + type: object + properties: + defaultMode: + type: integer + items: + type: array + items: + type: object + properties: + key: + type: string + mode: + type: integer + path: + type: string + name: + type: string + optional: + type: boolean + description: "`ConfigMap` to use to populate the volume. The name of the ConfigMap and the items key and path fields can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + persistentVolumeClaim: + type: object + properties: + claimName: + type: string + readOnly: + type: boolean + description: "`PersistentVolumeClaim` object to use to populate the volume. The name of the Persistent Volume Claim can use placeholders that would be replaced for every individual node. Valid placeholders that you can use in the template are `{nodeId}` and `{nodePodName}`." + oneOf: + - properties: + secret: {} + configMap: {} + persistentVolumeClaim: {} + description: Additional volumes that can be mounted to the pod. These volumes can use templates to mount different volumes into individual Pods. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." description: Template for Kafka Connect `Pods`. apiService: type: object @@ -2265,6 +2290,35 @@ spec: ip: type: string description: The pod's HostAliases. HostAliases is an optional list of hosts and IPs that will be injected into the Pod's hosts file if specified. + dnsPolicy: + type: string + enum: + - ClusterFirst + - ClusterFirstWithHostNet + - Default + - None + description: "The pod's DNSPolicy. Defaults to `ClusterFirst`. Valid values are `ClusterFirstWithHostNet`, `ClusterFirst`, `Default` or `None`." + dnsConfig: + type: object + properties: + nameservers: + type: array + items: + type: string + options: + type: array + items: + type: object + properties: + name: + type: string + value: + type: string + searches: + type: array + items: + type: string + description: "The pod's DNSConfig. If specified, it will be merged to the generated DNS configuration based on the DNSPolicy." enableServiceLinks: type: boolean description: Indicates whether information about services should be injected into Pod's environment variables. @@ -2300,7 +2354,7 @@ spec: type: boolean secretName: type: string - description: Secret to use populate the volume. + description: '`Secret` to use to populate the volume.' configMap: type: object properties: @@ -2321,20 +2375,20 @@ spec: type: string optional: type: boolean - description: ConfigMap to use to populate the volume. + description: '`ConfigMap` to use to populate the volume.' emptyDir: type: object properties: medium: type: string + enum: + - Memory + description: "Medium represents the type of storage medium should back this volume. Valid values are unset or `Memory`. When not set, it will use the node's default medium." sizeLimit: - type: object - properties: - amount: - type: string - format: - type: string - description: EmptyDir to use to populate the volume. + type: string + pattern: "^([0-9.]+)([eEinumkKMGTP]*[-+]?[0-9]*)$" + description: The total amount of local storage required for this EmptyDir volume (for example 1Gi). + description: '`EmptyDir` to use to populate the volume.' persistentVolumeClaim: type: object properties: @@ -2342,7 +2396,7 @@ spec: type: string readOnly: type: boolean - description: PersistentVolumeClaim object to use to populate the volume. + description: '`PersistentVolumeClaim` object to use to populate the volume.' csi: type: object properties: @@ -2361,7 +2415,15 @@ spec: additionalProperties: type: string type: object - description: CSIVolumeSource object to use to populate the volume. + description: '`CSIVolumeSource` object to use to populate the volume.' + image: + type: object + properties: + pullPolicy: + type: string + reference: + type: string + description: '`ImageVolumeSource` object to use to populate the volume.' oneOf: - properties: secret: {} @@ -2369,7 +2431,11 @@ spec: emptyDir: {} persistentVolumeClaim: {} csi: {} + image: {} description: Additional volumes that can be mounted to the pod. + hostUsers: + type: boolean + description: "Use the host user namespace. Optional. Defaults to `true`. When `true` or not set, the pod runs in the host user namespace. This is required when the pod needs features available only in the host namespace, such as loading kernel modules with `CAP_SYS_MODULE`.When set to `false`, the pod runs in a new user namespace. Setting `false` helps mitigate container breakout vulnerabilities and allows containers to run as `root` without granting `root` privileges on the host. This property is alpha-level in Kubernetes and is supported only by Kubernetes clusters that enable the `UserNamespacesSupport` feature." description: Template for Kafka Connect Build `Pods`. The build pod is used only on Kubernetes. buildContainer: type: object @@ -2572,119 +2638,10 @@ spec: description: Metadata applied to the resource. description: Template for Secret of the Kafka Connect Cluster JMX authentication. description: "Template for Kafka Connect and Kafka MirrorMaker 2 resources. The template allows users to specify how the `Pods`, `Service`, and other services are generated." - externalConfiguration: - type: object - properties: - env: - type: array - items: - type: object - properties: - name: - type: string - description: Name of the environment variable which will be passed to the Kafka Connect pods. The name of the environment variable cannot start with `KAFKA_` or `STRIMZI_`. - valueFrom: - type: object - properties: - secretKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a Secret. - configMapKeyRef: - type: object - properties: - key: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a ConfigMap. - oneOf: - - properties: - secretKeyRef: {} - required: - - secretKeyRef - - properties: - configMapKeyRef: {} - required: - - configMapKeyRef - description: Value of the environment variable which will be passed to the Kafka Connect pods. It can be passed either as a reference to Secret or ConfigMap field. The field has to specify exactly one Secret or ConfigMap. - required: - - name - - valueFrom - description: Makes data from a Secret or ConfigMap available in the Kafka Connect pods as environment variables. - volumes: - type: array - items: - type: object - properties: - name: - type: string - description: Name of the volume which will be added to the Kafka Connect pods. - secret: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - optional: - type: boolean - secretName: - type: string - description: Reference to a key in a Secret. Exactly one Secret or ConfigMap has to be specified. - configMap: - type: object - properties: - defaultMode: - type: integer - items: - type: array - items: - type: object - properties: - key: - type: string - mode: - type: integer - path: - type: string - name: - type: string - optional: - type: boolean - description: Reference to a key in a ConfigMap. Exactly one Secret or ConfigMap has to be specified. - oneOf: - - properties: - secret: {} - required: - - secret - - properties: - configMap: {} - required: - - configMap - required: - - name - description: Makes data from a Secret or ConfigMap available in the Kafka Connect pods as volumes. - description: Pass data from Secrets or ConfigMaps to the Kafka Connect pods and use them to configure connectors. required: - - connectCluster + - replicas + - target + - mirrors description: The specification of the Kafka MirrorMaker 2 cluster. status: type: object @@ -2759,3 +2716,5 @@ spec: type: integer description: The current number of pods being used to provide this resource. description: The status of the Kafka MirrorMaker 2 cluster. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/049-Crd-kafkarebalance.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/049-Crd-kafkarebalance.yaml index 024b15248..ae9ff2edd 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/049-Crd-kafkarebalance.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/crds/049-Crd-kafkarebalance.yaml @@ -21,7 +21,7 @@ spec: conversion: strategy: None versions: - - name: v1beta2 + - name: v1 served: true storage: true subresources: @@ -149,8 +149,17 @@ spec: sessionId: type: string description: The session identifier for requests to Cruise Control pertaining to this KafkaRebalance resource. This is used by the Kafka Rebalance operator to track the status of ongoing rebalancing operations. + progress: + type: object + properties: + rebalanceProgressConfigMap: + type: string + description: The name of the `ConfigMap` containing information related to the progress of a partition rebalance. + description: A reference to Config Map with the progress information. optimizationResult: x-kubernetes-preserve-unknown-fields: true type: object description: A JSON object describing the optimization result. description: The status of the Kafka rebalance. + required: + - spec diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-cruise-control.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-cruise-control.json index ef2ff14ed..0b32e3ef9 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-cruise-control.json +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-cruise-control.json @@ -464,7 +464,7 @@ }, { "datasource": "${DS_PROMETHEUS}", - "description": "Goal Violation Rate", + "description": "Goal violations per anomaly detector execution. Because Cruise Control emits cumulative counts, the Prometheus query window must be set to the anomaly detector run interval to preserve discrete per run counts (5 minutes by default)", "fieldConfig": { "defaults": { "color": { @@ -474,7 +474,7 @@ "axisBorderShow": false, "axisCenteredZero": false, "axisColorMode": "text", - "axisLabel": "violations/sec", + "axisLabel": "violations", "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", @@ -544,17 +544,16 @@ "targets": [ { "datasource": "${DS_PROMETHEUS}", - "expr": "sum(irate(kafka_cruisecontrol_anomalydetector_goal_violation_rate_count{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\",kubernetes_pod_name=~\"$strimzi_cluster_name-cruise-control-.*\"}[5m]))", - "format": "time_series", + "expr": "round(max_over_time(increase(kafka_cruisecontrol_anomalydetector_goal_violation_rate_count{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\",kubernetes_pod_name=~\"$strimzi_cluster_name-cruise-control-.*\"}[10m])[10m:]))", "hide": false, "instant": false, "interval": "", "intervalFactor": 1, - "legendFormat": "Goal Violation Rate", + "legendFormat": "Goal Violations", "refId": "A" } ], - "title": "Goal Violation Rate", + "title": "Goal Violations", "type": "timeseries" }, { @@ -2070,6 +2069,7 @@ }, "timezone": "", "title": "Strimzi Cruise Control", + "uid": "fb7da220847d2e2c", "version": 4, "weekStart": "" } diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-bridge.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-bridge.json index c9c51ec82..213352d0f 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-bridge.json +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-bridge.json @@ -231,7 +231,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -307,7 +307,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -383,7 +383,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -459,7 +459,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -3020,6 +3020,7 @@ }, "timezone": "", "title": "Strimzi Kafka Bridge", + "uid": "069669ed52041ef4", "version": 6, "weekStart": "" } diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-connect.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-connect.json index 4d278036f..d8e9d67c4 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-connect.json +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-connect.json @@ -771,7 +771,7 @@ "inspect": false }, "mappings": [], - "noValue": "0", + "noValue": "N/A", "thresholds": { "mode": "absolute", "steps": [ @@ -1803,6 +1803,7 @@ }, "timezone": "", "title": "Strimzi Kafka Connect", + "uid": "646c07d84adaf50d", "version": 6, "weekStart": "" } diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json index 20a78fd36..6acac8ca8 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-exporter.json @@ -1627,6 +1627,7 @@ }, "timezone": "browser", "title": "Strimzi Kafka Exporter", + "uid": "52a9e2042fa225a2", "version": 6, "weekStart": "" } diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-mirror-maker-2.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-mirror-maker-2.json index 280912661..888f5753f 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-mirror-maker-2.json +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-mirror-maker-2.json @@ -133,7 +133,7 @@ "step": 40 } ], - "title": "Number of Connectors", + "title": "Total Number of Running Connectors", "type": "stat" }, { @@ -211,45 +211,18 @@ }, { "datasource": "${DS_PROMETHEUS}", + "description": "Time duration between record timestamp in the source topic and the time when the source connector handles the record (aka. MM2 consumer lag time).", "fieldConfig": { "defaults": { "color": { - "mode": "palette-classic" + "mode": "thresholds" }, "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "Bytes/sec", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "align": "auto", + "cellOptions": {}, + "filterable": false }, "mappings": [], - "min": 0, "thresholds": { "mode": "absolute", "steps": [ @@ -263,145 +236,233 @@ } ] }, - "unit": "bytes" + "unit": "none" }, - "overrides": [] + "overrides": [ + { + "matcher": { + "id": "byName", + "options": "partition" + }, + "properties": [ + { + "id": "custom.width", + "value": 76 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Partition" + }, + "properties": [ + { + "id": "custom.width", + "value": 140 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Current" + }, + "properties": [ + { + "id": "custom.width", + "value": 126 + }, + { + "id": "unit", + "value": "ms" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Average" + }, + "properties": [ + { + "id": "custom.width", + "value": 118 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Min" + }, + "properties": [ + { + "id": "custom.width", + "value": 109 + }, + { + "id": "unit", + "value": "ms" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Max" + }, + "properties": [ + { + "id": "custom.width", + "value": 107 + }, + { + "id": "unit", + "value": "ms" + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Time" + }, + "properties": [ + { + "id": "custom.width", + "value": 188 + } + ] + }, + { + "matcher": { + "id": "byName", + "options": "Topic" + }, + "properties": [ + { + "id": "custom.width", + "value": 579 + } + ] + } + ] }, "gridPos": { "h": 8, - "w": 8, + "w": 16, "x": 8, "y": 1 }, - "id": 28, + "id": 39, "options": { - "legend": { - "calcs": [ - "mean", - "lastNotNull" + "cellHeight": "sm", + "footer": { + "countRows": false, + "fields": "", + "reducer": [ + "sum" ], - "displayMode": "table", - "placement": "bottom", - "showLegend": true + "show": false }, - "tooltip": { - "mode": "multi", - "sort": "none" - } + "frameIndex": 0, + "showHeader": true, + "sortBy": [ + { + "desc": false, + "displayName": "Time" + } + ] }, "pluginVersion": "7.4.5", "targets": [ { "datasource": "${DS_PROMETHEUS}", - "expr": "sum(rate(kafka_consumer_incoming_byte_total{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}[5m]))", - "format": "time_series", + "exemplar": false, + "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_record_age_ms{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", + "format": "table", + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "A" + }, + { + "datasource": "${DS_PROMETHEUS}", + "exemplar": false, + "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_record_age_ms_avg{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", + "format": "table", "hide": false, - "intervalFactor": 2, - "legendFormat": "{{kubernetes_pod_name}}", - "metric": "", - "refId": "A", - "step": 4 + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "B" + }, + { + "datasource": "${DS_PROMETHEUS}", + "exemplar": false, + "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_record_age_ms_min{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "C" + }, + { + "datasource": "${DS_PROMETHEUS}", + "exemplar": false, + "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_record_age_ms_max{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", + "format": "table", + "hide": false, + "instant": true, + "interval": "", + "legendFormat": "", + "refId": "D" } ], - "title": "Incoming Bytes per Second", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "Bytes/sec", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false + "title": "Record Age", + "transformations": [ + { + "id": "organize", + "options": { + "excludeByName": {}, + "indexByName": { + "Time": 0, + "Value": 3, + "partition": 2, + "topic": 1 }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" + "renameByName": { + "Value": "Lag", + "partition": "Partition", + "topic": "Topic" } - }, - "mappings": [], - "min": 0, - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "bytes" + } }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 1 - }, - "id": 29, - "options": { - "legend": { - "calcs": [ - "mean", - "lastNotNull" - ], - "displayMode": "table", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(rate(kafka_producer_outgoing_byte_total{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}[5m]))", - "format": "time_series", - "hide": false, - "intervalFactor": 2, - "legendFormat": "{{kubernetes_pod_name}}", - "metric": "", - "refId": "A", - "step": 4 + "id": "merge", + "options": {} + }, + { + "id": "organize", + "options": { + "excludeByName": {}, + "indexByName": {}, + "renameByName": { + "Value #A": "Current", + "Value #Avg": "Average", + "Value #B": "Average", + "Value #C": "Min", + "Value #D": "Max", + "partition": "Partition", + "topic": "Topic", + "{partition=\"2\", topic=\"my-cluster-source.kafka-test-apps\"}": "Min" + } + } } ], - "title": "Outgoing Bytes per Second", - "type": "timeseries" + "type": "table" }, { "datasource": "${DS_PROMETHEUS}", @@ -476,7 +537,7 @@ "step": 40 } ], - "title": "Number of Tasks", + "title": "Total Number of Running Tasks", "type": "stat" }, { @@ -542,7 +603,7 @@ "targets": [ { "datasource": "${DS_PROMETHEUS}", - "exemplar": true, + "exemplar": false, "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_byte_rate{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"})", "format": "time_series", "interval": "", @@ -557,27 +618,25 @@ }, { "datasource": "${DS_PROMETHEUS}", + "description": "Consumer lag which in the context of the replication indicates whether the consumer in the source connector can keep up with the rate records are produced in the source.", "fieldConfig": { "defaults": { "color": { "mode": "palette-classic" }, "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "msgs", + "axisLabel": "offset", "axisPlacement": "auto", "barAlignment": 0, "drawStyle": "line", "fillOpacity": 10, "gradientMode": "none", "hideFrom": { + "graph": false, "legend": false, "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -586,15 +645,9 @@ }, "showPoints": "never", "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "stacking": {}, + "thresholdsStyle": {} }, - "decimals": 0, "mappings": [], "thresholds": { "mode": "absolute", @@ -615,222 +668,43 @@ }, "gridPos": { "h": 8, - "w": 8, + "w": 12, "x": 0, "y": 9 }, - "id": 43, + "id": 34, "options": { "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "table", + "calcs": [], + "displayMode": "list", "placement": "bottom", "showLegend": true }, "tooltip": { "mode": "multi", "sort": "none" + }, + "tooltipOptions": { + "mode": "single" } }, "pluginVersion": "7.4.5", "targets": [ { "datasource": "${DS_PROMETHEUS}", - "expr": "sum(kafka_connect_source_task_source_record_active_count{connector=~\"\\\".*SourceConnector\\\"\"})", + "exemplar": false, + "expr": "sum(kafka_consumer_fetch_manager_records_lag{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\",clientid=~\".*replication-consumer\\\"\"}) by (topic, partition)", "interval": "", - "legendFormat": "", + "legendFormat": "{{topic}} (partition: {{partition}})", "refId": "A" } ], - "title": "Source Connector - Connect Outstanding Messages Queue", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "bytes", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 9 - }, - "id": 44, - "options": { - "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "table", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(kafka_producer_buffer_available_bytes{clientid=~\"\\\".*SourceConnector-[0-9]+\\\"\"})", - "interval": "", - "legendFormat": "{{clientid}}", - "refId": "A" - } - ], - "title": "Source Connector - Producer Available Buffer", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "ms", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 9 - }, - "id": 45, - "options": { - "legend": { - "calcs": [ - "lastNotNull" - ], - "displayMode": "table", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(kafka_connect_connector_task_offset_commit_avg_time_ms{connector=~\"\\\".*SourceConnector\\\"\", task=~\"[0-9]+\"})/count(kafka_connect_connector_task_offset_commit_avg_time_ms{connector=~\"\\\".*SourceConnector\\\"\", task=~\"[0-9]+\"})", - "interval": "", - "legendFormat": "", - "refId": "A" - } - ], - "title": "Source Connector - Average Offset Commit Time", + "title": "Consumer Lag", "type": "timeseries" }, { "datasource": "${DS_PROMETHEUS}", + "description": "Consumer lag which in the context of the replication indicates whether the consumer in the source connector can keep up with the rate records are produced in the source.", "fieldConfig": { "defaults": { "color": { @@ -838,11 +712,8 @@ }, "custom": { "align": "auto", - "cellOptions": { - "type": "auto" - }, - "filterable": false, - "inspect": false + "cellOptions": {}, + "filterable": false }, "mappings": [], "thresholds": { @@ -857,103 +728,17 @@ "value": 80 } ] - }, - "unit": "none" - }, - "overrides": [ - { - "matcher": { - "id": "byName", - "options": "partition" - }, - "properties": [ - { - "id": "custom.width", - "value": 76 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Partition" - }, - "properties": [ - { - "id": "custom.width", - "value": 76 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Current" - }, - "properties": [ - { - "id": "custom.width", - "value": 65 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Average" - }, - "properties": [ - { - "id": "custom.width", - "value": 70 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Min" - }, - "properties": [ - { - "id": "custom.width", - "value": 45 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Max" - }, - "properties": [ - { - "id": "custom.width", - "value": 41 - } - ] - }, - { - "matcher": { - "id": "byName", - "options": "Time" - }, - "properties": [ - { - "id": "custom.width", - "value": 146 - } - ] } - ] + }, + "overrides": [] }, "gridPos": { - "h": 10, + "h": 8, "w": 12, - "x": 0, - "y": 17 + "x": 12, + "y": 9 }, - "id": 39, + "id": 36, "options": { "cellHeight": "sm", "footer": { @@ -964,62 +749,23 @@ ], "show": false }, - "frameIndex": 0, - "showHeader": true, - "sortBy": [ - { - "desc": false, - "displayName": "Time" - } - ] + "frameIndex": 1, + "showHeader": true }, "pluginVersion": "7.4.5", "targets": [ { "datasource": "${DS_PROMETHEUS}", "exemplar": false, - "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_record_age_ms{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", + "expr": "topk(20, sum(kafka_consumer_fetch_manager_records_lag{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\",clientid=~\".*replication-consumer\\\"\"}) by (partition, topic))", "format": "table", "instant": true, "interval": "", - "legendFormat": "", + "legendFormat": "{{topic}} (partition: {{partition}})", "refId": "A" - }, - { - "datasource": "${DS_PROMETHEUS}", - "exemplar": true, - "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_record_age_ms_avg{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "B" - }, - { - "datasource": "${DS_PROMETHEUS}", - "exemplar": true, - "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_record_age_ms_min{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "C" - }, - { - "datasource": "${DS_PROMETHEUS}", - "exemplar": true, - "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_record_age_ms_max{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", - "format": "table", - "hide": false, - "instant": true, - "interval": "", - "legendFormat": "", - "refId": "D" } ], - "title": "Record Age", + "title": "Consumer Lag", "transformations": [ { "id": "organize", @@ -1037,33 +783,198 @@ "topic": "Topic" } } - }, - { - "id": "merge", - "options": {} - }, - { - "id": "organize", - "options": { - "excludeByName": {}, - "indexByName": {}, - "renameByName": { - "Value #A": "Current", - "Value #Avg": "Average", - "Value #B": "Average", - "Value #C": "Min", - "Value #D": "Max", - "partition": "Partition", - "topic": "Topic", - "{partition=\"2\", topic=\"my-cluster-source.kafka-test-apps\"}": "Min" - } - } } ], "type": "table" }, { "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "graph": false, + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": {}, + "thresholdsStyle": {} + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "binBps" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 0, + "y": 17 + }, + "id": 28, + "options": { + "legend": { + "calcs": [ + "mean", + "lastNotNull" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + }, + "tooltipOptions": { + "mode": "single" + } + }, + "pluginVersion": "7.4.5", + "targets": [ + { + "datasource": "${DS_PROMETHEUS}", + "expr": "sum(rate(kafka_consumer_incoming_byte_total{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}[5m])) by (kubernetes_pod_name)", + "format": "time_series", + "hide": false, + "interval": "", + "intervalFactor": 2, + "legendFormat": "{{kubernetes_pod_name}}", + "metric": "", + "refId": "A", + "step": 4 + } + ], + "title": "Incoming Bytes per Second", + "type": "timeseries" + }, + { + "datasource": "${DS_PROMETHEUS}", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "graph": false, + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": {}, + "thresholdsStyle": {} + }, + "mappings": [], + "min": 0, + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "binBps" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 12, + "x": 12, + "y": 17 + }, + "id": 29, + "options": { + "legend": { + "calcs": [ + "mean", + "lastNotNull" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + }, + "tooltipOptions": { + "mode": "single" + } + }, + "pluginVersion": "7.4.5", + "targets": [ + { + "datasource": "${DS_PROMETHEUS}", + "expr": "sum(rate(kafka_producer_outgoing_byte_total{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}[5m])) by (kubernetes_pod_name)", + "format": "time_series", + "hide": false, + "intervalFactor": 2, + "legendFormat": "{{kubernetes_pod_name}}", + "metric": "", + "refId": "A", + "step": 4 + } + ], + "title": "Outgoing Bytes per Second", + "type": "timeseries" + }, + { + "datasource": "${DS_PROMETHEUS}", + "description": "The end to end latency from the record timestamp in the source topic to the time when the record is written successfully to the target cluster.", "fieldConfig": { "defaults": { "color": { @@ -1071,11 +982,8 @@ }, "custom": { "align": "auto", - "cellOptions": { - "type": "auto" - }, - "filterable": false, - "inspect": false + "cellOptions": {}, + "filterable": false }, "mappings": [], "thresholds": { @@ -1126,6 +1034,10 @@ { "id": "custom.width", "value": 65 + }, + { + "id": "unit", + "value": "ms" } ] }, @@ -1138,6 +1050,10 @@ { "id": "custom.width", "value": 70 + }, + { + "id": "unit", + "value": "ms" } ] }, @@ -1150,6 +1066,10 @@ { "id": "custom.width", "value": 45 + }, + { + "id": "unit", + "value": "ms" } ] }, @@ -1162,6 +1082,10 @@ { "id": "custom.width", "value": 41 + }, + { + "id": "unit", + "value": "ms" } ] }, @@ -1176,14 +1100,26 @@ "value": 155 } ] + }, + { + "matcher": { + "id": "byName", + "options": "Topic" + }, + "properties": [ + { + "id": "custom.width", + "value": 552 + } + ] } ] }, "gridPos": { - "h": 5, + "h": 8, "w": 12, - "x": 12, - "y": 17 + "x": 0, + "y": 25 }, "id": 40, "options": { @@ -1219,7 +1155,7 @@ }, { "datasource": "${DS_PROMETHEUS}", - "exemplar": true, + "exemplar": false, "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_replication_latency_ms_avg{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", "format": "table", "hide": false, @@ -1230,7 +1166,7 @@ }, { "datasource": "${DS_PROMETHEUS}", - "exemplar": true, + "exemplar": false, "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_replication_latency_ms_min{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", "format": "table", "hide": false, @@ -1241,7 +1177,7 @@ }, { "datasource": "${DS_PROMETHEUS}", - "exemplar": true, + "exemplar": false, "expr": "sum(kafka_connect_mirror_mirrorsourceconnector_replication_latency_ms_max{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\"}) by (partition, topic)", "format": "table", "hide": false, @@ -1296,6 +1232,7 @@ }, { "datasource": "${DS_PROMETHEUS}", + "description": "The latency for synchronizing the consumer groups of the source cluster to the target cluster.", "fieldConfig": { "defaults": { "color": { @@ -1303,11 +1240,8 @@ }, "custom": { "align": "auto", - "cellOptions": { - "type": "auto" - }, - "filterable": true, - "inspect": false + "cellOptions": {}, + "filterable": true }, "mappings": [], "thresholds": { @@ -1333,7 +1267,7 @@ "properties": [ { "id": "unit", - "value": "dtdurationms" + "value": "ms" }, { "id": "custom.width", @@ -1356,10 +1290,10 @@ ] }, "gridPos": { - "h": 5, + "h": 8, "w": 12, "x": 12, - "y": 22 + "y": 25 }, "id": 41, "options": { @@ -1379,7 +1313,7 @@ "refId": "A" } ], - "title": "Offset Synchronization Latency", + "title": "Consumer Group Offset Sync Latency", "transformations": [ { "id": "organize", @@ -1401,13 +1335,13 @@ "topic": 1 }, "renameByName": { + "Value": "Latency", "group": "Group", "instance": "", "partition": "Partition", "source": "Source", "target": "Target", - "topic": "Topic", - "Value": "Latency" + "topic": "Topic" } } } @@ -1422,9 +1356,6 @@ "mode": "palette-classic" }, "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -1432,11 +1363,11 @@ "fillOpacity": 10, "gradientMode": "none", "hideFrom": { + "graph": false, "legend": false, "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1445,13 +1376,8 @@ }, "showPoints": "never", "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "stacking": {}, + "thresholdsStyle": {} }, "mappings": [], "thresholds": { @@ -1467,129 +1393,247 @@ } ] }, + "unit": "bytes" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 0, + "y": 33 + }, + "id": 44, + "options": { + "legend": { + "calcs": [ + "lastNotNull" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + }, + "tooltipOptions": { + "mode": "single" + } + }, + "pluginVersion": "7.4.5", + "targets": [ + { + "datasource": "${DS_PROMETHEUS}", + "expr": "sum(kafka_producer_buffer_available_bytes{clientid=~\"\\\".*SourceConnector-[0-9]+\\\"\"})", + "interval": "", + "legendFormat": "{{clientid}}", + "refId": "A" + } + ], + "title": "Source Connector - Producer Available Buffer", + "type": "timeseries" + }, + { + "datasource": "${DS_PROMETHEUS}", + "description": "Time duration that this task takes to commit its offsets to the target.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "graph": false, + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": {}, + "thresholdsStyle": {} + }, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, + "unit": "ms" + }, + "overrides": [] + }, + "gridPos": { + "h": 8, + "w": 8, + "x": 8, + "y": 33 + }, + "id": 45, + "options": { + "legend": { + "calcs": [ + "lastNotNull" + ], + "displayMode": "table", + "placement": "bottom", + "showLegend": true + }, + "tooltip": { + "mode": "multi", + "sort": "none" + }, + "tooltipOptions": { + "mode": "single" + } + }, + "pluginVersion": "7.4.5", + "targets": [ + { + "datasource": "${DS_PROMETHEUS}", + "expr": "sum(kafka_connect_connector_task_offset_commit_avg_time_ms{connector=~\"\\\".*SourceConnector\\\"\", task=~\"[0-9]+\"})/count(kafka_connect_connector_task_offset_commit_avg_time_ms{connector=~\"\\\".*SourceConnector\\\"\", task=~\"[0-9]+\"})", + "interval": "", + "legendFormat": "", + "refId": "A" + } + ], + "title": "Source Connector - Average Offset Commit Time", + "type": "timeseries" + }, + { + "datasource": "${DS_PROMETHEUS}", + "description": "The number of records that this task has consumed from the source but not yet produced to the target.", + "fieldConfig": { + "defaults": { + "color": { + "mode": "palette-classic" + }, + "custom": { + "axisLabel": "msgs", + "axisPlacement": "auto", + "barAlignment": 0, + "drawStyle": "line", + "fillOpacity": 10, + "gradientMode": "none", + "hideFrom": { + "graph": false, + "legend": false, + "tooltip": false, + "viz": false + }, + "lineInterpolation": "linear", + "lineWidth": 1, + "pointSize": 5, + "scaleDistribution": { + "type": "linear" + }, + "showPoints": "never", + "spanNulls": false, + "stacking": {}, + "thresholdsStyle": {} + }, + "decimals": 0, + "mappings": [], + "thresholds": { + "mode": "absolute", + "steps": [ + { + "color": "green", + "value": null + }, + { + "color": "red", + "value": 80 + } + ] + }, "unit": "short" }, - "overrides": [] + "overrides": [ + { + "__systemRef": "hideSeriesFrom", + "matcher": { + "id": "byNames", + "options": { + "mode": "exclude", + "names": [ + "sum(kafka_connect_source_task_source_record_active_count{connector=~\"\\\".*SourceConnector\\\"\"})" + ], + "prefix": "All except:", + "readOnly": true + } + }, + "properties": [ + { + "id": "custom.hideFrom", + "value": { + "graph": true, + "legend": false, + "tooltip": false + } + } + ] + } + ] }, "gridPos": { - "h": 9, - "w": 12, - "x": 0, - "y": 27 + "h": 8, + "w": 8, + "x": 16, + "y": 33 }, - "id": 34, + "id": 43, "options": { "legend": { - "calcs": [], - "displayMode": "list", + "calcs": [ + "lastNotNull" + ], + "displayMode": "table", "placement": "bottom", "showLegend": true }, "tooltip": { "mode": "multi", "sort": "none" + }, + "tooltipOptions": { + "mode": "single" } }, "pluginVersion": "7.4.5", "targets": [ { "datasource": "${DS_PROMETHEUS}", - "exemplar": true, - "expr": "sum(kafka_consumer_fetch_manager_records_lag{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\",clientid!~\"consumer-mirrormaker2-.*\"}) by (topic, partition)", + "expr": "sum(kafka_connect_source_task_source_record_active_count{connector=~\"\\\".*SourceConnector\\\"\"})", "interval": "", - "legendFormat": "{{topic}} (partition: {{partition}})", + "legendFormat": "", "refId": "A" } ], - "title": "Consumer Lag", + "title": "Source Connector - Connect Outstanding Messages Queue", "type": "timeseries" }, - { - "datasource": "${DS_PROMETHEUS}", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "custom": { - "align": "auto", - "cellOptions": { - "type": "auto" - }, - "filterable": false, - "inspect": false - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - } - }, - "overrides": [] - }, - "gridPos": { - "h": 9, - "w": 12, - "x": 12, - "y": 27 - }, - "id": 36, - "options": { - "cellHeight": "sm", - "footer": { - "countRows": false, - "fields": "", - "reducer": [ - "sum" - ], - "show": false - }, - "showHeader": true - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "exemplar": true, - "expr": "sum(kafka_consumer_fetch_manager_records_lag{strimzi_io_kind=~\"KafkaMirrorMaker2\",strimzi_io_cluster=\"$strimzi_mirror_maker_cluster_name\",clientid!~\"consumer-mirrormaker2-.*\"}) by (partition, topic)", - "format": "table", - "instant": true, - "interval": "", - "legendFormat": "{{topic}} (partition: {{partition}})", - "refId": "A" - } - ], - "title": "Consumer Lag", - "transformations": [ - { - "id": "organize", - "options": { - "excludeByName": {}, - "indexByName": { - "Time": 0, - "Value": 3, - "partition": 2, - "topic": 1 - }, - "renameByName": { - "Value": "Lag", - "partition": "Partition", - "topic": "Topic" - } - } - } - ], - "type": "table" - }, { "collapsed": false, "datasource": "${DS_PROMETHEUS}", @@ -1597,7 +1641,7 @@ "h": 1, "w": 24, "x": 0, - "y": 36 + "y": 41 }, "id": 53, "panels": [], @@ -1614,6 +1658,7 @@ "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { + "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -1635,7 +1680,7 @@ "h": 3, "w": 12, "x": 0, - "y": 37 + "y": 42 }, "id": 55, "options": { @@ -1654,6 +1699,7 @@ }, "showUnfilled": true, "sizing": "auto", + "text": {}, "valueMode": "color" }, "pluginVersion": "7.4.5", @@ -1679,9 +1725,6 @@ "mode": "palette-classic" }, "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -1689,11 +1732,11 @@ "fillOpacity": 10, "gradientMode": "none", "hideFrom": { + "graph": false, "legend": false, "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1702,13 +1745,8 @@ }, "showPoints": "never", "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "stacking": {}, + "thresholdsStyle": {} }, "decimals": 0, "mappings": [], @@ -1735,7 +1773,7 @@ "h": 6, "w": 12, "x": 12, - "y": 37 + "y": 42 }, "id": 59, "options": { @@ -1748,6 +1786,9 @@ "tooltip": { "mode": "multi", "sort": "none" + }, + "tooltipOptions": { + "mode": "single" } }, "pluginVersion": "7.4.5", @@ -1767,6 +1808,7 @@ "datasource": "${DS_PROMETHEUS}", "fieldConfig": { "defaults": { + "custom": {}, "mappings": [], "thresholds": { "mode": "absolute", @@ -1788,7 +1830,7 @@ "h": 3, "w": 12, "x": 0, - "y": 40 + "y": 45 }, "id": 57, "options": { @@ -1807,6 +1849,7 @@ }, "showUnfilled": true, "sizing": "auto", + "text": {}, "valueMode": "color" }, "pluginVersion": "7.4.5", @@ -1829,7 +1872,7 @@ "h": 1, "w": 24, "x": 0, - "y": 43 + "y": 48 }, "id": 51, "panels": [], @@ -1850,9 +1893,6 @@ "mode": "palette-classic" }, "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", "axisLabel": "Cores", "axisPlacement": "auto", "barAlignment": 0, @@ -1860,11 +1900,11 @@ "fillOpacity": 10, "gradientMode": "none", "hideFrom": { + "graph": false, "legend": false, "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1873,13 +1913,8 @@ }, "showPoints": "never", "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "stacking": {}, + "thresholdsStyle": {} }, "mappings": [], "thresholds": { @@ -1903,7 +1938,7 @@ "h": 7, "w": 6, "x": 0, - "y": 44 + "y": 49 }, "id": 30, "options": { @@ -1918,12 +1953,16 @@ "tooltip": { "mode": "multi", "sort": "none" + }, + "tooltipOptions": { + "mode": "single" } }, "pluginVersion": "7.4.5", "targets": [ { "datasource": "${DS_PROMETHEUS}", + "exemplar": false, "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_mirror_maker_cluster_name-mirrormaker2-.+\",container=\"$strimzi_mirror_maker_cluster_name-mirrormaker2\"}[5m])) by (pod)", "format": "time_series", "hide": false, @@ -1945,9 +1984,6 @@ "mode": "palette-classic" }, "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", "axisLabel": "Memory", "axisPlacement": "auto", "barAlignment": 0, @@ -1955,11 +1991,11 @@ "fillOpacity": 10, "gradientMode": "none", "hideFrom": { + "graph": false, "legend": false, "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -1968,13 +2004,8 @@ }, "showPoints": "never", "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "stacking": {}, + "thresholdsStyle": {} }, "mappings": [], "thresholds": { @@ -1998,7 +2029,7 @@ "h": 7, "w": 6, "x": 6, - "y": 44 + "y": 49 }, "id": 31, "options": { @@ -2013,6 +2044,9 @@ "tooltip": { "mode": "multi", "sort": "none" + }, + "tooltipOptions": { + "mode": "single" } }, "pluginVersion": "7.4.5", @@ -2040,9 +2074,6 @@ "mode": "palette-classic" }, "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", "axisLabel": "% time in GC", "axisPlacement": "auto", "barAlignment": 0, @@ -2050,11 +2081,11 @@ "fillOpacity": 10, "gradientMode": "none", "hideFrom": { + "graph": false, "legend": false, "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2063,13 +2094,8 @@ }, "showPoints": "never", "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "stacking": {}, + "thresholdsStyle": {} }, "mappings": [], "max": 100, @@ -2094,7 +2120,7 @@ "h": 7, "w": 6, "x": 12, - "y": 44 + "y": 49 }, "id": 32, "options": { @@ -2110,6 +2136,9 @@ "tooltip": { "mode": "multi", "sort": "none" + }, + "tooltipOptions": { + "mode": "single" } }, "pluginVersion": "7.4.5", @@ -2138,9 +2167,6 @@ "mode": "palette-classic" }, "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", "axisLabel": "", "axisPlacement": "auto", "barAlignment": 0, @@ -2148,11 +2174,11 @@ "fillOpacity": 10, "gradientMode": "none", "hideFrom": { + "graph": false, "legend": false, "tooltip": false, "viz": false }, - "insertNulls": false, "lineInterpolation": "linear", "lineWidth": 1, "pointSize": 5, @@ -2161,13 +2187,8 @@ }, "showPoints": "never", "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } + "stacking": {}, + "thresholdsStyle": {} }, "decimals": 0, "mappings": [], @@ -2192,7 +2213,7 @@ "h": 7, "w": 6, "x": 18, - "y": 44 + "y": 49 }, "id": 49, "options": { @@ -2207,6 +2228,9 @@ "tooltip": { "mode": "multi", "sort": "none" + }, + "tooltipOptions": { + "mode": "single" } }, "pluginVersion": "7.4.5", @@ -2224,8 +2248,9 @@ "type": "timeseries" } ], - "refresh": "5s", - "schemaVersion": 39, + "refresh": false, + "schemaVersion": 27, + "style": "dark", "tags": [ "Strimzi", "Kafka", @@ -2234,7 +2259,12 @@ "templating": { "list": [ { - "current": {}, + "current": { + "selected": false, + "text": "Prometheus", + "value": "Prometheus" + }, + "description": null, "error": null, "hide": 0, "includeAll": false, @@ -2249,36 +2279,57 @@ "type": "datasource" }, { - "current": {}, + "allValue": null, + "current": { + "selected": false, + "text": "default", + "value": "default" + }, "datasource": "${DS_PROMETHEUS}", "definition": "", + "description": null, + "error": null, "hide": 0, "includeAll": false, "label": "Namespace", "multi": false, "name": "kubernetes_namespace", "options": [], - "query": "query_result(kafka_connect_worker_connector_count{strimzi_io_kind=\"KafkaMirrorMaker2\"})", + "query": { + "query": "query_result(kafka_connect_worker_connector_count{strimzi_io_kind=\"KafkaMirrorMaker2\"})", + "refId": "Prometheus-kubernetes_namespace-Variable-Query" + }, "refresh": 1, "regex": "/.*namespace=\"([^\"]*).*/", "skipUrlSync": false, "sort": 0, "tagValuesQuery": "", + "tags": [], "tagsQuery": "", "type": "query", "useTags": false }, { - "current": {}, + "allValue": null, + "current": { + "selected": false, + "text": "my-mirror-maker-2", + "value": "my-mirror-maker-2" + }, "datasource": "${DS_PROMETHEUS}", "definition": "", + "description": null, + "error": null, "hide": 0, "includeAll": false, "label": "Cluster Name", "multi": false, "name": "strimzi_mirror_maker_cluster_name", "options": [], - "query": "query_result(kafka_connect_worker_connector_count{namespace=\"$kubernetes_namespace\", strimzi_io_kind=\"KafkaMirrorMaker2\"})", + "query": { + "query": "query_result(kafka_connect_worker_connector_count{namespace=\"$kubernetes_namespace\", strimzi_io_kind=\"KafkaMirrorMaker2\"})", + "refId": "Prometheus-strimzi_mirror_maker_cluster_name-Variable-Query" + }, "refresh": 1, "regex": "/.*strimzi_io_cluster=\"([^\"]*).*/", "skipUrlSync": false, @@ -2321,6 +2372,7 @@ }, "timezone": "", "title": "Strimzi Kafka Mirror Maker 2", - "version": 9, + "uid": "6e9806b052af8d25", + "version": 11, "weekStart": "" -} +} \ No newline at end of file diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-oauth.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-oauth.json index be572c9f1..732283910 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-oauth.json +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka-oauth.json @@ -153,7 +153,7 @@ { "datasource": "${DS_PROMETHEUS}", "exemplar": true, - "expr": "irate(strimzi_oauth_http_requests_count{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval]) * 30", + "expr": "irate(strimzi_oauth_http_requests_count_total{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval]) * 30", "format": "time_series", "instant": false, "interval": "60s", @@ -249,7 +249,7 @@ { "datasource": "${DS_PROMETHEUS}", "exemplar": true, - "expr": "irate(strimzi_oauth_validation_requests_count{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval]) * 30", + "expr": "irate(strimzi_oauth_validation_requests_count_total{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval]) * 30", "format": "time_series", "instant": false, "interval": "60s", @@ -344,7 +344,7 @@ { "datasource": "${DS_PROMETHEUS}", "exemplar": true, - "expr": "strimzi_oauth_http_requests_count{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}", + "expr": "strimzi_oauth_http_requests_count_total{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}", "format": "time_series", "instant": false, "interval": "60s", @@ -439,7 +439,7 @@ { "datasource": "${DS_PROMETHEUS}", "exemplar": true, - "expr": "strimzi_oauth_validation_requests_count{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}", + "expr": "strimzi_oauth_validation_requests_count_total{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}", "format": "time_series", "instant": false, "interval": "60s", @@ -534,7 +534,7 @@ { "datasource": "${DS_PROMETHEUS}", "exemplar": true, - "expr": "irate(strimzi_oauth_http_requests_totaltimems{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval]) / irate(strimzi_oauth_http_requests_count{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval])", + "expr": "irate(strimzi_oauth_http_requests_totaltimems_total{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval]) / irate(strimzi_oauth_http_requests_count_total{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval])", "format": "time_series", "instant": false, "interval": "60s", @@ -630,7 +630,7 @@ { "datasource": "${DS_PROMETHEUS}", "exemplar": true, - "expr": "irate(strimzi_oauth_validation_requests_totaltimems{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval]) / irate(strimzi_oauth_validation_requests_count{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval])\n", + "expr": "irate(strimzi_oauth_validation_requests_totaltimems_total{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval]) / irate(strimzi_oauth_validation_requests_count_total{namespace=\"$kubernetes_namespace\",pod=~\"$strimzi_cluster_name-$kafka_broker\"}[$__rate_interval])\n", "format": "time_series", "instant": false, "interval": "60s", @@ -764,6 +764,7 @@ }, "timezone": "", "title": "Strimzi Kafka OAuth", + "uid": "3797efba280f9ed6", "version": 6, "weekStart": "" } diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka.json index 4a4176b70..62fbf4946 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka.json +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kafka.json @@ -447,7 +447,7 @@ "match": "null", "result": { "color": "#508642", - "text": "0" + "text": "N/A" } }, "type": "special" @@ -526,7 +526,7 @@ "match": "null", "result": { "color": "#508642", - "text": "0" + "text": "N/A" } }, "type": "special" @@ -1438,7 +1438,7 @@ "match": "null", "result": { "color": "rgba(237, 129, 40, 0.89)", - "text": "0" + "text": "N/A" } }, "type": "special" @@ -1519,7 +1519,7 @@ "match": "null", "result": { "color": "rgba(237, 129, 40, 0.89)", - "text": "0" + "text": "N/A" } }, "type": "special" @@ -1600,7 +1600,7 @@ "match": "null", "result": { "color": "rgba(237, 129, 40, 0.89)", - "text": "0" + "text": "N/A" } }, "type": "special" @@ -1681,7 +1681,7 @@ "match": "null", "result": { "color": "rgba(237, 129, 40, 0.89)", - "text": "0" + "text": "N/A" } }, "type": "special" @@ -2383,7 +2383,7 @@ }, "gridPos": { "h": 8, - "w": 8, + "w": 12, "x": 0, "y": 47 }, @@ -2475,8 +2475,8 @@ }, "gridPos": { "h": 8, - "w": 8, - "x": 8, + "w": 12, + "x": 12, "y": 47 }, "id": 105, @@ -2567,9 +2567,9 @@ }, "gridPos": { "h": 8, - "w": 8, - "x": 16, - "y": 47 + "w": 12, + "x": 0, + "y": 55 }, "id": 106, "options": { @@ -2636,7 +2636,7 @@ "gridPos": { "h": 8, "w": 12, - "x": 0, + "x": 12, "y": 55 }, "id": 91, @@ -2722,97 +2722,6 @@ } ], "type": "table" - }, - { - "datasource": "${DS_PROMETHEUS}", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 12, - "x": 12, - "y": 55 - }, - "id": 110, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(kafka_server_zookeeperclientmetrics_zookeeperrequestlatencyms{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-$kafka_broker\",strimzi_io_name=\"$strimzi_cluster_name-kafka\"}) by (kubernetes_pod_name)", - "format": "time_series", - "instant": false, - "intervalFactor": 1, - "legendFormat": "{{kubernetes_pod_name}}", - "refId": "A" - } - ], - "title": "ZK request latecy", - "type": "timeseries" } ], "refresh": "5s", @@ -2974,6 +2883,7 @@ }, "timezone": "", "title": "Strimzi Kafka", + "uid": "7ddce8bf9ea7ddb5", "version": 4, "weekStart": "" } diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json index 96055f96e..d46f434ec 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-kraft.json @@ -2115,6 +2115,7 @@ }, "timezone": "", "title": "Strimzi KRaft", + "uid": "d1b98e4d984de29d", "version": 6, "weekStart": "" } diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-operators.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-operators.json index 8b3a05af0..5c074e8fd 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-operators.json +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-operators.json @@ -154,7 +154,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -226,7 +226,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -298,7 +298,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -370,7 +370,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -442,7 +442,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -493,13 +493,13 @@ "targets": [ { "datasource": "${DS_PROMETHEUS}", - "expr": "sum(strimzi_resources{kind=\"KafkaMirrorMaker\"})", + "expr": "sum(strimzi_resources{kind=\"KafkaNodePool\"})", "format": "time_series", "intervalFactor": 1, "refId": "A" } ], - "title": "Mirror Maker CRs", + "title": "Node Pool CRs", "type": "stat" }, { @@ -514,7 +514,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -586,7 +586,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -658,7 +658,7 @@ "options": { "match": "null", "result": { - "text": "0" + "text": "N/A" } }, "type": "special" @@ -1771,6 +1771,7 @@ }, "timezone": "", "title": "Strimzi Operators", + "uid": "31545fecf446bf88", "version": 6, "weekStart": "" } diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-zookeeper.json b/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-zookeeper.json deleted file mode 100644 index 4a8aa7524..000000000 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/files/grafana-dashboards/strimzi-zookeeper.json +++ /dev/null @@ -1,1412 +0,0 @@ -{ - "__requires": [ - { - "type": "grafana", - "id": "grafana", - "name": "Grafana", - "version": "7.4.5" - }, - { - "type": "panel", - "id": "stat", - "name": "Stat" - }, - { - "type": "datasource", - "id": "prometheus", - "name": "Prometheus" - }, - { - "type": "panel", - "id": "timeseries", - "name": "Timeseries" - } - ], - "annotations": { - "list": [ - { - "builtIn": 1, - "datasource": { - "type": "datasource", - "uid": "grafana" - }, - "enable": true, - "hide": true, - "iconColor": "rgba(0, 211, 255, 1)", - "limit": 100, - "name": "Annotations & Alerts", - "showIn": 0, - "type": "dashboard" - } - ] - }, - "editable": true, - "fiscalYearStartMonth": 0, - "graphTooltip": 0, - "id": 11, - "links": [], - "panels": [ - { - "collapsed": false, - "datasource": { - "type": "datasource", - "uid": "grafana" - }, - "gridPos": { - "h": 1, - "w": 24, - "x": 0, - "y": 0 - }, - "id": 26, - "panels": [], - "targets": [ - { - "datasource": { - "type": "datasource", - "uid": "grafana" - }, - "refId": "A" - } - ], - "title": "ZooKeeper", - "type": "row" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "Quorum size of ZooKeeper ensemble", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#d44a3a", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 2 - }, - { - "color": "#299c46", - "value": 3 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 4, - "w": 4, - "x": 0, - "y": 1 - }, - "id": 52, - "maxDataPoints": 100, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "max(zookeeper_quorumsize{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\",strimzi_io_kind=\"Kafka\"})", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "title": "Quorum Size", - "type": "stat" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "Number of active connections", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#299c46", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 60 - }, - { - "color": "#d44a3a", - "value": 120 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 4, - "w": 4, - "x": 4, - "y": 1 - }, - "id": 54, - "maxDataPoints": 100, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(zookeeper_numaliveconnections{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\",strimzi_io_kind=\"Kafka\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\"})", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "title": "Active Connections", - "type": "stat" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "Number of queued requests in the server. This goes up when the server receives more requests than it can process", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 8, - "x": 8, - "y": 1 - }, - "id": 12, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(zookeeper_outstandingrequests{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\",strimzi_io_kind=\"Kafka\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\"}) by (kubernetes_pod_name)", - "format": "time_series", - "interval": "", - "intervalFactor": 1, - "legendFormat": "{{kubernetes_pod_name}}", - "refId": "A" - } - ], - "title": "Outstanding Requests", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "Amount of time (in ms) it takes for the server to respond to a client request", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "Request Latency (ms)", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "ms" - }, - "overrides": [] - }, - "gridPos": { - "h": 8, - "w": 8, - "x": 16, - "y": 1 - }, - "id": 6, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(zookeeper_avgrequestlatency{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\"}) by (kubernetes_pod_name)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{kubernetes_pod_name}}", - "refId": "A" - } - ], - "title": "Request Latency - Average", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#299c46", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 500 - }, - { - "color": "#d44a3a", - "value": 800 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 4, - "w": 4, - "x": 0, - "y": 5 - }, - "id": 64, - "maxDataPoints": 100, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "avg(zookeeper_inmemorydatatree_nodecount{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\",strimzi_io_kind=\"Kafka\"})", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "title": "Number of ZNodes", - "type": "stat" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "Number of watchers", - "fieldConfig": { - "defaults": { - "color": { - "mode": "thresholds" - }, - "mappings": [ - { - "options": { - "match": "null", - "result": { - "text": "N/A" - } - }, - "type": "special" - } - ], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "#299c46", - "value": null - }, - { - "color": "rgba(237, 129, 40, 0.89)", - "value": 100 - }, - { - "color": "#d44a3a", - "value": 200 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 4, - "w": 4, - "x": 4, - "y": 5 - }, - "id": 66, - "maxDataPoints": 100, - "options": { - "colorMode": "value", - "graphMode": "none", - "justifyMode": "auto", - "orientation": "horizontal", - "reduceOptions": { - "calcs": [ - "lastNotNull" - ], - "fields": "", - "values": false - }, - "showPercentChange": false, - "textMode": "auto", - "wideLayout": true - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(zookeeper_inmemorydatatree_watchcount{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\",strimzi_io_kind=\"Kafka\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\"})", - "format": "time_series", - "intervalFactor": 1, - "refId": "A" - } - ], - "title": "Number of watchers", - "type": "stat" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "ZooKeeper pods memory usage", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "bytes" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 0, - "y": 9 - }, - "id": 87, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(container_memory_usage_bytes{namespace=\"$kubernetes_namespace\",container=\"zookeeper\",pod=~\"$strimzi_cluster_name-$zk_node\"}) by (pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{pod}}", - "refId": "A" - } - ], - "title": "Memory Usage", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "Aggregated ZooKeeper pods CPU usage", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 6, - "y": 9 - }, - "id": 85, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(rate(container_cpu_usage_seconds_total{namespace=\"$kubernetes_namespace\",container=\"zookeeper\",pod=~\"$strimzi_cluster_name-$zk_node\"}[5m])) by (pod)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{pod}}", - "refId": "A" - } - ], - "title": "CPU Usage", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "Kafka broker pods disk usage", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "bytes" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 12, - "y": 9 - }, - "id": 89, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(kubelet_volume_stats_available_bytes{namespace=\"$kubernetes_namespace\",persistentvolumeclaim=~\"data(-[0-9]+)?-$strimzi_cluster_name-$zk_node\", persistentvolumeclaim=~\".*zookeeper(-[0-9]+)?$\"}) by (persistentvolumeclaim)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{persistentvolumeclaim}}", - "refId": "A" - } - ], - "title": "Available Disk Space", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "Open File Descriptors", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "none" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 18, - "y": 9 - }, - "id": 96, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(process_open_fds{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\",container=\"zookeeper\"}) by (kubernetes_pod_name)", - "format": "time_series", - "hide": false, - "intervalFactor": 1, - "legendFormat": "{{kubernetes_pod_name}}", - "refId": "A" - } - ], - "title": "Open File Descriptors", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "decbytes" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 0, - "y": 16 - }, - "id": 91, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(jvm_memory_used_bytes{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\",strimzi_io_name=\"$strimzi_cluster_name-zookeeper\"}) by (kubernetes_pod_name)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{kubernetes_pod_name}}", - "refId": "A" - } - ], - "title": "JVM Memory Used", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "ms" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 6, - "y": 16 - }, - "id": 93, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(rate(jvm_gc_collection_seconds_sum{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\",strimzi_io_name=\"$strimzi_cluster_name-zookeeper\"}[5m])) by (kubernetes_pod_name)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{kubernetes_pod_name}}", - "refId": "A" - } - ], - "title": "JVM GC Time", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 12, - "y": 16 - }, - "id": 95, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(rate(jvm_gc_collection_seconds_count{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\",strimzi_io_name=\"$strimzi_cluster_name-zookeeper\"}[5m])) by (kubernetes_pod_name)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{kubernetes_pod_name}}", - "refId": "A" - } - ], - "title": "JVM GC Count", - "type": "timeseries" - }, - { - "datasource": "${DS_PROMETHEUS}", - "description": "JVM thread count", - "fieldConfig": { - "defaults": { - "color": { - "mode": "palette-classic" - }, - "custom": { - "axisBorderShow": false, - "axisCenteredZero": false, - "axisColorMode": "text", - "axisLabel": "", - "axisPlacement": "auto", - "barAlignment": 0, - "drawStyle": "line", - "fillOpacity": 10, - "gradientMode": "none", - "hideFrom": { - "legend": false, - "tooltip": false, - "viz": false - }, - "insertNulls": false, - "lineInterpolation": "linear", - "lineWidth": 1, - "pointSize": 5, - "scaleDistribution": { - "type": "linear" - }, - "showPoints": "never", - "spanNulls": false, - "stacking": { - "group": "A", - "mode": "none" - }, - "thresholdsStyle": { - "mode": "off" - } - }, - "mappings": [], - "thresholds": { - "mode": "absolute", - "steps": [ - { - "color": "green", - "value": null - }, - { - "color": "red", - "value": 80 - } - ] - }, - "unit": "short" - }, - "overrides": [] - }, - "gridPos": { - "h": 7, - "w": 6, - "x": 18, - "y": 16 - }, - "id": 97, - "options": { - "legend": { - "calcs": [], - "displayMode": "list", - "placement": "bottom", - "showLegend": true - }, - "tooltip": { - "mode": "multi", - "sort": "none" - } - }, - "pluginVersion": "7.4.5", - "targets": [ - { - "datasource": "${DS_PROMETHEUS}", - "expr": "sum(jvm_threads_current{namespace=\"$kubernetes_namespace\",kubernetes_pod_name=~\"$strimzi_cluster_name-$zk_node\",strimzi_io_name=\"$strimzi_cluster_name-zookeeper\"}) by (kubernetes_pod_name)", - "format": "time_series", - "intervalFactor": 1, - "legendFormat": "{{kubernetes_pod_name}}", - "refId": "A" - } - ], - "title": "JVM thread count", - "type": "timeseries" - } - ], - "refresh": "5s", - "schemaVersion": 39, - "tags": [ - "Strimzi", - "Kafka", - "Zookeeper" - ], - "templating": { - "list": [ - { - "current": {}, - "error": null, - "hide": 0, - "includeAll": false, - "label": "datasource", - "multi": false, - "name": "DS_PROMETHEUS", - "options": [], - "query": "prometheus", - "refresh": 1, - "regex": "", - "skipUrlSync": false, - "type": "datasource" - }, - { - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "", - "hide": 0, - "includeAll": false, - "label": "Namespace", - "multi": false, - "name": "kubernetes_namespace", - "options": [], - "query": "query_result(zookeeper_inmemorydatatree_nodecount)", - "refresh": 1, - "regex": "/.*namespace=\"([^\"]*).*/", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "", - "hide": 0, - "includeAll": false, - "label": "Cluster Name", - "multi": false, - "name": "strimzi_cluster_name", - "options": [], - "query": "query_result(zookeeper_inmemorydatatree_nodecount{namespace=\"$kubernetes_namespace\"})", - "refresh": 1, - "regex": "/.*strimzi_io_cluster=\"([^\"]*).*/", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false - }, - { - "allValue": ".*", - "current": {}, - "datasource": "${DS_PROMETHEUS}", - "definition": "", - "hide": 0, - "includeAll": true, - "label": "Node", - "multi": false, - "name": "zk_node", - "options": [], - "query": "query_result(zookeeper_inmemorydatatree_nodecount{namespace=\"$kubernetes_namespace\",strimzi_io_cluster=\"$strimzi_cluster_name\"})", - "refresh": 1, - "regex": "/.*pod_name=\"$strimzi_cluster_name-([^\"]*).*/", - "skipUrlSync": false, - "sort": 0, - "tagValuesQuery": "", - "tagsQuery": "", - "type": "query", - "useTags": false - } - ] - }, - "time": { - "from": "now-1h", - "to": "now" - }, - "timepicker": { - "refresh_intervals": [ - "5s", - "10s", - "30s", - "1m", - "5m", - "15m", - "30m", - "1h", - "2h", - "1d" - ], - "time_options": [ - "5m", - "15m", - "1h", - "6h", - "12h", - "24h", - "2d", - "7d", - "30d" - ] - }, - "timezone": "", - "title": "Strimzi ZooKeeper", - "version": 6, - "weekStart": "" -} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml index b29eaa921..8ccd010ce 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/020-ClusterRole-strimzi-cluster-operator-role.yaml @@ -64,13 +64,19 @@ rules: - delete - patch - update +- apiGroups: + - "" + resources: + # For inplace resizing, we need access to pods/resize subresource + - pods/resize + verbs: + - patch + - update - apiGroups: - "apps" resources: # The cluster operator needs to access and manage deployments to run deployment based Strimzi components - deployments - # The cluster operator needs to access and manage stateful sets to run stateful sets based Strimzi components - - statefulsets # The cluster operator needs to access replica-sets to manage Strimzi components and to determine error states - replicasets verbs: @@ -162,4 +168,17 @@ rules: - delete - patch - update +- apiGroups: + - gateway.networking.k8s.io + resources: + # The cluster operator needs to access and manage TLSRoutes to expose Strimzi components for external access + - tlsroutes + verbs: + - get + - list + - watch + - create + - delete + - patch + - update {{- end -}} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml index dae5166d6..d8b9f4fac 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/020-RoleBinding-strimzi-cluster-operator.yaml @@ -1,39 +1,35 @@ {{- if .Values.rbac.create -}} -{{- $root := . -}} -{{- $watchNamespaces := .Values.watchNamespaces -}} -{{- if $root.Values.watchAnyNamespace }} - {{- $watchNamespaces = list -}} -{{- end }} -{{- range append $watchNamespaces .Release.Namespace }} +{{- $namespaces := include "strimzi.watchNamespacesList" . | fromYamlArray }} +{{- range $i, $ns := $namespaces }} --- apiVersion: rbac.authorization.k8s.io/v1 -{{- if $root.Values.watchAnyNamespace }} +{{- if $.Values.watchAnyNamespace }} kind: ClusterRoleBinding {{- else }} kind: RoleBinding {{- end }} metadata: - {{- if $root.Values.watchAnyNamespace }} + {{- if $.Values.watchAnyNamespace }} name: strimzi-cluster-operator-namespaced {{- else }} name: strimzi-cluster-operator - {{- end }} - {{- if not $root.Values.watchAnyNamespace }} - namespace: {{ . }} + {{- end }} + {{- if not $.Values.watchAnyNamespace }} + namespace: {{ $ns }} {{- end }} labels: - app: {{ template "strimzi.name" $root }} - chart: {{ template "strimzi.chart" $root }} + app: {{ template "strimzi.name" $ }} + chart: {{ template "strimzi.chart" $ }} component: role-binding - release: {{ $root.Release.Name }} - heritage: {{ $root.Release.Service }} + release: {{ $.Release.Name }} + heritage: {{ $.Release.Service }} subjects: - kind: ServiceAccount - name: {{ $root.Values.serviceAccount }} - namespace: {{ $root.Release.Namespace }} + name: {{ $.Values.serviceAccount }} + namespace: {{ $.Release.Namespace }} roleRef: kind: ClusterRole name: strimzi-cluster-operator-namespaced apiGroup: rbac.authorization.k8s.io {{- end }} -{{- end }} +{{- end -}} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/023-ClusterRole-strimzi-cluster-operator-role.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/023-ClusterRole-strimzi-cluster-operator-role.yaml index 0f70ff131..30b753bd4 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/023-ClusterRole-strimzi-cluster-operator-role.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/023-ClusterRole-strimzi-cluster-operator-role.yaml @@ -30,7 +30,6 @@ rules: - kafkanodepools - kafkaconnects - kafkaconnectors - - kafkamirrormakers - kafkabridges - kafkamirrormaker2s - kafkarebalances @@ -49,7 +48,6 @@ rules: - kafkanodepools/status - kafkaconnects/status - kafkaconnectors/status - - kafkamirrormakers/status - kafkabridges/status - kafkamirrormaker2s/status - kafkarebalances/status @@ -57,10 +55,23 @@ rules: - get - patch - update +- apiGroups: + - "kafka.strimzi.io" + resources: + # Needed for environments with enabled OwnerReferencesPermissionEnforcement admission controller (e.g. OpenShift) + - kafkas/finalizers + - kafkanodepools/finalizers + - kafkaconnects/finalizers + - kafkaconnectors/finalizers + - kafkabridges/finalizers + - kafkamirrormaker2s/finalizers + - kafkarebalances/finalizers + verbs: + - update - apiGroups: - "core.strimzi.io" resources: - # The cluster operator uses StrimziPodSets to manage the Kafka and ZooKeeper pods + # The cluster operator uses StrimziPodSets to manage the Kafka, Kafka Connect, and Kafka MirrorMaker 2 pods - strimzipodsets verbs: - get @@ -79,6 +90,13 @@ rules: - get - patch - update +- apiGroups: + - "core.strimzi.io" + resources: + # Needed for environments with enabled OwnerReferencesPermissionEnforcement admission controller (e.g. OpenShift) + - strimzipodsets/finalizers + verbs: + - update - apiGroups: - "kafka.strimzi.io" resources: diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/023-RoleBinding-strimzi-cluster-operator.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/023-RoleBinding-strimzi-cluster-operator.yaml index 57cac997f..ed68d1aaa 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/023-RoleBinding-strimzi-cluster-operator.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/023-RoleBinding-strimzi-cluster-operator.yaml @@ -1,39 +1,35 @@ {{- if .Values.rbac.create -}} -{{- $root := . -}} -{{- $watchNamespaces := .Values.watchNamespaces -}} -{{- if $root.Values.watchAnyNamespace }} - {{- $watchNamespaces = list -}} -{{- end }} -{{- range append $watchNamespaces .Release.Namespace }} +{{- $namespaces := include "strimzi.watchNamespacesList" . | fromYamlArray }} +{{- range $i, $ns := $namespaces }} --- apiVersion: rbac.authorization.k8s.io/v1 -{{- if $root.Values.watchAnyNamespace }} +{{- if $.Values.watchAnyNamespace }} kind: ClusterRoleBinding {{- else }} kind: RoleBinding {{- end }} metadata: - {{- if $root.Values.watchAnyNamespace }} + {{- if $.Values.watchAnyNamespace }} name: strimzi-cluster-operator-watched {{- else }} name: strimzi-cluster-operator-watched {{- end }} - {{- if not $root.Values.watchAnyNamespace }} - namespace: {{ . }} + {{- if not $.Values.watchAnyNamespace }} + namespace: {{ $ns }} {{- end }} labels: - app: {{ template "strimzi.name" $root }} - chart: {{ template "strimzi.chart" $root }} + app: {{ template "strimzi.name" $ }} + chart: {{ template "strimzi.chart" $ }} component: role-binding - release: {{ $root.Release.Name }} - heritage: {{ $root.Release.Service }} + release: {{ $.Release.Name }} + heritage: {{ $.Release.Service }} subjects: - kind: ServiceAccount - name: {{ $root.Values.serviceAccount }} - namespace: {{ $root.Release.Namespace }} + name: {{ $.Values.serviceAccount }} + namespace: {{ $.Release.Namespace }} roleRef: kind: ClusterRole name: strimzi-cluster-operator-watched apiGroup: rbac.authorization.k8s.io {{- end }} -{{- end }} +{{- end -}} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml index f47e0023a..6f370424f 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/031-ClusterRole-strimzi-entity-operator.yaml @@ -46,6 +46,14 @@ rules: - get - patch - update +- apiGroups: + - "kafka.strimzi.io" + resources: + # Needed for environments with enabled OwnerReferencesPermissionEnforcement admission controller (e.g. OpenShift) + - kafkatopics/finalizers + - kafkausers/finalizers + verbs: + - update - apiGroups: - "" resources: diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml index f222a4b0a..93bd641d9 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/031-RoleBinding-strimzi-cluster-operator-entity-operator-delegation.yaml @@ -1,37 +1,33 @@ {{- if .Values.rbac.create -}} -{{- $root := . -}} -{{- $watchNamespaces := .Values.watchNamespaces -}} -{{- if $root.Values.watchAnyNamespace }} - {{- $watchNamespaces = list -}} -{{- end }} -{{- range append $watchNamespaces .Release.Namespace }} +{{- $namespaces := include "strimzi.watchNamespacesList" . | fromYamlArray }} +{{- range $i, $ns := $namespaces }} --- apiVersion: rbac.authorization.k8s.io/v1 -{{- if $root.Values.watchAnyNamespace }} +{{- if $.Values.watchAnyNamespace }} kind: ClusterRoleBinding {{- else }} kind: RoleBinding {{- end }} metadata: name: strimzi-cluster-operator-entity-operator-delegation - {{- if not $root.Values.watchAnyNamespace }} - namespace: {{ . }} + {{- if not $.Values.watchAnyNamespace }} + namespace: {{ $ns }} {{- end }} labels: - app: {{ template "strimzi.name" $root }} - chart: {{ template "strimzi.chart" $root }} + app: {{ template "strimzi.name" $ }} + chart: {{ template "strimzi.chart" $ }} component: entity-operator-role-binding - release: {{ $root.Release.Name }} - heritage: {{ $root.Release.Service }} + release: {{ $.Release.Name }} + heritage: {{ $.Release.Service }} # The Entity Operator cluster role must be bound to the cluster operator service account so that it can delegate the cluster role to the Entity Operator. # This must be done to avoid escalating privileges which would be blocked by Kubernetes. subjects: - kind: ServiceAccount - name: {{ $root.Values.serviceAccount }} - namespace: {{ $root.Release.Namespace }} + name: {{ $.Values.serviceAccount }} + namespace: {{ $.Release.Namespace }} roleRef: kind: ClusterRole name: strimzi-entity-operator apiGroup: rbac.authorization.k8s.io {{- end }} -{{- end }} +{{- end -}} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/050-ConfigMap-strimzi-cluster-operator.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/050-ConfigMap-strimzi-cluster-operator.yaml index 35233a1dc..fa451e149 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/050-ConfigMap-strimzi-cluster-operator.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/050-ConfigMap-strimzi-cluster-operator.yaml @@ -30,10 +30,6 @@ data: logger.kafka.name = org.apache.kafka logger.kafka.level = WARN - # Zookeeper is very verbose even on INFO level -> We set it to WARN by default - logger.zookeepertrustmanager.name = org.apache.zookeeper - logger.zookeepertrustmanager.level = WARN - # Keeps separate level for Netty logging -> to not be changed by the root logger logger.netty.name = io.netty logger.netty.level = INFO diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/051-PodDisruptionBudget-strimzi-cluster-operator.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/051-PodDisruptionBudget-strimzi-cluster-operator.yaml index eb461f333..f5e308d59 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/051-PodDisruptionBudget-strimzi-cluster-operator.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/051-PodDisruptionBudget-strimzi-cluster-operator.yaml @@ -13,4 +13,7 @@ spec: {{- if .Values.podDisruptionBudget.maxUnavailable }} maxUnavailable: {{ .Values.podDisruptionBudget.maxUnavailable }} {{- end }} -{{- end }} \ No newline at end of file + {{- if (semverCompare ">= 1.30-0" .Capabilities.KubeVersion.Version) }} + unhealthyPodEvictionPolicy: {{ .Values.podDisruptionBudget.unhealthyPodEvictionPolicy }} + {{- end }} +{{- end }} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/052-NetworkPolicy-strimzi-cluster-operator.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/052-NetworkPolicy-strimzi-cluster-operator.yaml new file mode 100644 index 000000000..cee59b0d4 --- /dev/null +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/052-NetworkPolicy-strimzi-cluster-operator.yaml @@ -0,0 +1,21 @@ +{{- if .Values.operatorNetworkPolicy.enabled -}} +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: strimzi-cluster-operator-network-policy +spec: + egress: + {{- with .Values.operatorNetworkPolicy.egress }} + {{- toYaml . | nindent 4 }} + {{- end }} + ingress: + {{- with .Values.operatorNetworkPolicy.ingress }} + {{- toYaml . | nindent 4 }} + {{- end }} + podSelector: + matchLabels: + name: strimzi-cluster-operator + policyTypes: + - Egress + - Ingress +{{- end }} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/060-Deployment-strimzi-cluster-operator.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/060-Deployment-strimzi-cluster-operator.yaml index 16e4f0f22..8e5a1676d 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/060-Deployment-strimzi-cluster-operator.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/060-Deployment-strimzi-cluster-operator.yaml @@ -1,3 +1,4 @@ +--- apiVersion: apps/v1 kind: Deployment metadata: @@ -9,8 +10,19 @@ metadata: component: deployment release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- with .Values.deploymentLabels }} + {{- toYaml . | nindent 4 }} + {{- end }} + {{- with .Values.deploymentAnnotations }} + annotations: + {{- toYaml . | nindent 4 }} + {{- end }} spec: replicas: {{ .Values.replicas }} + {{- with .Values.deploymentStrategy }} + strategy: + {{- toYaml . | trim | nindent 4 }} + {{- end }} {{- if .Values.revisionHistoryLimit }} revisionHistoryLimit: {{ .Values.revisionHistoryLimit }} {{- end }} @@ -32,6 +44,7 @@ spec: {{- end }} spec: serviceAccountName: {{ .Values.serviceAccount }} + automountServiceAccountToken: false {{- /* imagePullSecrets is allowed to be for backwards compatibility */ -}} {{- if kindIs "string" .Values.image.imagePullSecrets }} imagePullSecrets: @@ -42,6 +55,12 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} {{- end }} + {{- if kindIs "bool" .Values.hostUsers }} + hostUsers: {{ .Values.hostUsers }} + {{- end }} + {{- if kindIs "bool" .Values.enableServiceLinks }} + enableServiceLinks: {{ .Values.enableServiceLinks }} + {{- end }} {{- with .Values.podSecurityContext }} securityContext: {{ toYaml . | nindent 8 }} {{- end }} @@ -49,6 +68,23 @@ spec: priorityClassName: {{ .Values.priorityClassName }} {{- end }} volumes: + - name: kube-api-access + projected: + defaultMode: 420 + sources: + - serviceAccountToken: + path: token + - configMap: + name: kube-root-ca.crt + items: + - key: ca.crt + path: ca.crt + - downwardAPI: + items: + - path: namespace + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace - name: strimzi-tmp emptyDir: medium: Memory @@ -68,6 +104,9 @@ spec: args: - /opt/strimzi/bin/cluster_operator_run.sh volumeMounts: + - mountPath: /var/run/secrets/kubernetes.io/serviceaccount + name: kube-api-access + readOnly: true - name: strimzi-tmp mountPath: /tmp - name: {{ .Values.logVolume }} @@ -77,10 +116,8 @@ spec: {{- if .Values.watchAnyNamespace }} value: "*" {{- else }} - {{- if .Values.watchNamespaces -}} - {{- $ns := .Values.watchNamespaces -}} - {{- $ns := append $ns .Release.Namespace }} - value: "{{ join "," $ns }}" + {{- if .Values.watchNamespaces }} + value: "{{ include "strimzi.watchNamespacesList" . | fromYamlArray | join "," }}" {{- else }} valueFrom: fieldRef: @@ -88,9 +125,9 @@ spec: {{- end }} {{- end }} - name: STRIMZI_FULL_RECONCILIATION_INTERVAL_MS - value: {{ .Values.fullReconciliationIntervalMs | quote }} + value: {{ .Values.fullReconciliationIntervalMs | int64 | quote }} - name: STRIMZI_OPERATION_TIMEOUT_MS - value: {{ .Values.operationTimeoutMs | quote }} + value: {{ .Values.operationTimeoutMs | int64 | quote }} {{- template "strimzi.kafka.image.map" . }} - name: STRIMZI_DEFAULT_TOPIC_OPERATOR_IMAGE value: {{ template "strimzi.image" (set . "key" "topicOperator") }} @@ -102,6 +139,8 @@ spec: value: {{ template "strimzi.image" (set . "key" "kafkaBridge") }} - name: STRIMZI_DEFAULT_KANIKO_EXECUTOR_IMAGE value: {{ template "strimzi.image" (set . "key" "kanikoExecutor") }} + - name: STRIMZI_DEFAULT_BUILDAH_IMAGE + value: {{ template "strimzi.image" (set . "key" "buildah") }} - name: STRIMZI_DEFAULT_MAVEN_BUILDER value: {{ template "strimzi.image" (set . "key" "mavenBuilder") }} - name: STRIMZI_OPERATOR_NAMESPACE @@ -124,7 +163,8 @@ spec: - name: STRIMZI_IMAGE_PULL_POLICY value: {{ .Values.image.imagePullPolicy }} {{- end }} - {{ if ne .Values.kubernetesServiceDnsDomain "cluster.local" }}- name: KUBERNETES_SERVICE_DNS_DOMAIN + {{ if ne .Values.kubernetesServiceDnsDomain "cluster.local" }} + - name: KUBERNETES_SERVICE_DNS_DOMAIN value: {{ .Values.kubernetesServiceDnsDomain | quote }}{{ end }} - name: STRIMZI_FEATURE_GATES value: {{ .Values.featureGates | quote }} @@ -138,7 +178,7 @@ spec: {{- end }} {{- if ne (int .Values.connectBuildTimeoutMs) 300000 }} - name: STRIMZI_CONNECT_BUILD_TIMEOUT_MS - value: {{ .Values.connectBuildTimeoutMs | quote }} + value: {{ .Values.connectBuildTimeoutMs | int64 | quote }} {{- end }} {{- if ne .Values.generatePodDisruptionBudget true}} - name: STRIMZI_POD_DISRUPTION_BUDGET_GENERATION @@ -192,3 +232,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} + {{- with .Values.topologySpreadConstraints }} + topologySpreadConstraints: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/070-ClusterRole-strimzi-admin.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/070-ClusterRole-strimzi-admin.yaml index 32e48d8c6..c86547197 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/070-ClusterRole-strimzi-admin.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/070-ClusterRole-strimzi-admin.yaml @@ -21,8 +21,6 @@ rules: - kafkanodepools/scale - kafkaconnects - kafkaconnects/scale - - kafkamirrormakers - - kafkamirrormakers/scale - kafkausers - kafkatopics - kafkabridges diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/080-ClusterRole-strimzi-view.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/080-ClusterRole-strimzi-view.yaml index b29a20ee6..7f850f807 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/080-ClusterRole-strimzi-view.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/080-ClusterRole-strimzi-view.yaml @@ -18,7 +18,6 @@ rules: - kafkas - kafkanodepools - kafkaconnects - - kafkamirrormakers - kafkausers - kafkatopics - kafkabridges diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/_helpers.tpl b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/_helpers.tpl index c23d603fb..e67e89c0c 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/_helpers.tpl +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/_helpers.tpl @@ -61,3 +61,12 @@ To use, add the following key/value pairs to the scope: {{- end -}} {{- join "," $pluckedList -}} {{- end -}} + +{{/* + Create a list of comma-separated namespaces the operators should watch. +*/}} +{{- define "strimzi.watchNamespacesList" -}} +{{- $namespacesList := .Values.watchNamespaces | default (list) -}} +{{- $returnList := append $namespacesList .Release.Namespace | sortAlpha | uniq -}} +{{- toYaml $returnList -}} +{{- end -}} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl index 9bd1e9d54..599dab86a 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/templates/_kafka_image_map.tpl @@ -6,31 +6,25 @@ {{/* Generate the kafka image map */}} {{- define "strimzi.kafka.image.map" }} - name: STRIMZI_DEFAULT_KAFKA_EXPORTER_IMAGE - value: {{ template "strimzi.image" (merge . (dict "key" "kafkaExporter" "tagSuffix" "-kafka-3.9.1")) }} + value: {{ template "strimzi.image" (merge . (dict "key" "kafkaExporter" "tagSuffix" "-kafka-4.3.1")) }} - name: STRIMZI_DEFAULT_CRUISE_CONTROL_IMAGE - value: {{ template "strimzi.image" (merge . (dict "key" "cruiseControl" "tagSuffix" "-kafka-3.9.1")) }} + value: {{ template "strimzi.image" (merge . (dict "key" "cruiseControl" "tagSuffix" "-kafka-4.3.1")) }} - name: STRIMZI_KAFKA_IMAGES value: | - 3.8.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.8.0")) }} - 3.8.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.8.1")) }} - 3.9.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.9.0")) }} - 3.9.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-3.9.1")) }} + 4.2.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-4.2.0")) }} + 4.2.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-4.2.1")) }} + 4.3.0={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-4.3.0")) }} + 4.3.1={{ template "strimzi.image" (merge . (dict "key" "kafka" "tagSuffix" "-kafka-4.3.1")) }} - name: STRIMZI_KAFKA_CONNECT_IMAGES value: | - 3.8.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.8.0")) }} - 3.8.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.8.1")) }} - 3.9.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.9.0")) }} - 3.9.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-3.9.1")) }} - - name: STRIMZI_KAFKA_MIRROR_MAKER_IMAGES - value: | - 3.8.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.8.0")) }} - 3.8.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.8.1")) }} - 3.9.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.9.0")) }} - 3.9.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker" "tagSuffix" "-kafka-3.9.1")) }} + 4.2.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-4.2.0")) }} + 4.2.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-4.2.1")) }} + 4.3.0={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-4.3.0")) }} + 4.3.1={{ template "strimzi.image" (merge . (dict "key" "kafkaConnect" "tagSuffix" "-kafka-4.3.1")) }} - name: STRIMZI_KAFKA_MIRROR_MAKER_2_IMAGES value: | - 3.8.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.8.0")) }} - 3.8.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.8.1")) }} - 3.9.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.9.0")) }} - 3.9.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-3.9.1")) }} + 4.2.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-4.2.0")) }} + 4.2.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-4.2.1")) }} + 4.3.0={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-4.3.0")) }} + 4.3.1={{ template "strimzi.image" (merge . (dict "key" "kafkaMirrorMaker2" "tagSuffix" "-kafka-4.3.1")) }} {{- end -}} diff --git a/packages/system/kafka-operator/charts/strimzi-kafka-operator/values.yaml b/packages/system/kafka-operator/charts/strimzi-kafka-operator/values.yaml index 0c3fef280..c6009aaa3 100644 --- a/packages/system/kafka-operator/charts/strimzi-kafka-operator/values.yaml +++ b/packages/system/kafka-operator/charts/strimzi-kafka-operator/values.yaml @@ -3,14 +3,13 @@ # Default replicas for the cluster operator replicas: 1 -# If you set `watchNamespaces` to the same value as ``.Release.Namespace` (e.g. `helm ... --namespace $NAMESPACE`), -# the chart will fail because duplicate RoleBindings will be attempted to be created in the same namespace +# Contains `.Release.Namespace` by default watchNamespaces: [] watchAnyNamespace: false defaultImageRegistry: quay.io defaultImageRepository: strimzi -defaultImageTag: 0.45.1-rc1 +defaultImageTag: 1.2.0 image: registry: "" @@ -37,14 +36,30 @@ tmpDirSizeLimit: 1Mi extraEnvs: [] tolerations: [] +topologySpreadConstraints: [] affinity: {} annotations: {} labels: {} nodeSelector: {} +deploymentAnnotations: {} +deploymentLabels: {} +deploymentStrategy: {} priorityClassName: "" +hostUsers: NULL +enableServiceLinks: NULL podSecurityContext: {} -securityContext: {} +securityContext: + # Specifies container security context. Defaults to a security context that matches the Restricted Kubernetes + # Pod Security Standard (https://kubernetes.io/docs/concepts/security/pod-security-standards/). + allowPrivilegeEscalation: false + runAsNonRoot: true + readOnlyRootFilesystem: true + capabilities: + drop: + - ALL + seccompProfile: + type: RuntimeDefault rbac: create: yes serviceAccountCreate: yes @@ -56,7 +71,10 @@ leaderElection: # https://kubernetes.io/docs/tasks/run-application/configure-pdb/ podDisruptionBudget: enabled: false - # The PDB definition only has two attributes to control the availability requirements: minAvailable or maxUnavailable (mutually exclusive). + # The PDB definition three attributes to control the availability requirements: + # minAvailable or maxUnavailable (mutually exclusive). + # unhealthyPodEvictionPolicy + # # Field maxUnavailable tells how many pods can be down and minAvailable tells how many pods must be running in a cluster. # The pdb template will check values according to below order @@ -71,6 +89,29 @@ podDisruptionBudget: # If both values are set, the template will use the first one and ignore the second one. currently by default minAvailable is set to 1 minAvailable: 1 maxUnavailable: + unhealthyPodEvictionPolicy: IfHealthyBudget + +operatorNetworkPolicy: + # If enabled, this will generate a networkPolicy for the strimzi-operator. + # This flag DOES NOT control operator generated networkPolicies! + # This flag ONLY controls access for the strimzi-operator deployment. + enabled: false + # For ingress we permit access to the metrics endpoint + ingress: + - ports: + - protocol: TCP + port: http + # The operator must communicate with DNS, the Kubernetes API server, + # and all managed Kafka components. + # + # The operands use numerous ports that differ per component and may exist in + # "arbitrary" namespaces. This makes a generic egress NetworkPolicy + # impractical to define. Thus we set `{}` an unrestrictred value. + # + # Any meaningful network restrictions must be defined per cluster, + # with a full knowledge of the Kafka topology and port configuration. + egress: + - {} # If you are using the grafana dashboard sidecar, # you can import some default dashboards here @@ -82,9 +123,8 @@ dashboards: annotations: {} extraLabels: {} -# Docker images that operator uses to provision various components of Strimzi. To use your own registry prefix the -# repository name with your registry URL. -# Ex) repository: registry.xyzcorp.com/strimzi/kafka +# Docker images that operator uses to provision various components of Strimzi. +# To use your own registry or repository, define them for each component below or generally via defaultImageRegistry and defaultImageRepository above kafka: image: registry: "" @@ -115,18 +155,12 @@ kafkaInit: repository: "" name: operator tag: "" -kafkaMirrorMaker: - image: - registry: "" - repository: "" - name: kafka - tagPrefix: "" kafkaBridge: image: registry: "" repository: name: kafka-bridge - tag: 0.31.2 + tag: 1.1.0 kafkaExporter: image: registry: "" @@ -151,6 +185,12 @@ kanikoExecutor: repository: "" name: kaniko-executor tag: "" +buildah: + image: + registry: "" + repository: "" + name: buildah + tag: "" mavenBuilder: image: registry: "" @@ -182,4 +222,4 @@ generateNetworkPolicy: true # Override the value for Connect build timeout connectBuildTimeoutMs: 300000 # Controls whether Strimzi generates pod disruption budget resources (By default true) -generatePodDisruptionBudget: true \ No newline at end of file +generatePodDisruptionBudget: true