Comments from Paolo and Jakub

Signed-off-by: Lukas Kral <lukywill16@gmail.com>

Author: im-konge

cluster-operator/src/main/java/io/strimzi/operator/cluster/model/KafkaConnectBuild.java

@@ -51,8 +51,8 @@
 public class KafkaConnectBuild extends AbstractModel {
     protected static final String COMPONENT_TYPE = "kafka-connect-build";
 
-    private static final String DEFAULT_KANIKO_EXECUTOR_IMAGE = "gcr.io/kaniko-project/executor:latest";
-    private static final String DEFAULT_BUILDAH_IMAGE = "quay.io/strimzi/buildah:latest";
+    /*test*/ static final String DEFAULT_KANIKO_EXECUTOR_IMAGE = "gcr.io/kaniko-project/executor:latest";
+    /*test*/ static final String DEFAULT_BUILDAH_IMAGE = "quay.io/strimzi/buildah:latest";
 
     protected static final String CO_ENV_VAR_CUSTOM_CONNECT_BUILD_POD_LABELS = "STRIMZI_CUSTOM_KAFKA_CONNECT_BUILD_LABELS";
 
@@ -84,6 +84,7 @@ public class KafkaConnectBuild extends AbstractModel {
     protected KafkaConnectBuild(Reconciliation reconciliation, HasMetadata resource, SharedEnvironmentProvider sharedEnvironmentProvider, boolean useConnectBuildWithBuildah) {
         super(reconciliation, resource, KafkaConnectResources.buildPodName(resource.getMetadata().getName()), COMPONENT_TYPE, sharedEnvironmentProvider);
 
+        // TODO: use configuration from the `ClusterOperatorConfig` rather than from env variables directly - https://github.com/strimzi/strimzi-kafka-operator/issues/11981
         if (useConnectBuildWithBuildah) {
             this.image = System.getenv().getOrDefault(ClusterOperatorConfig.STRIMZI_DEFAULT_BUILDAH_IMAGE, DEFAULT_BUILDAH_IMAGE);
         } else {

cluster-operator/src/test/java/io/strimzi/operator/cluster/model/KafkaConnectBuildTest.java

@@ -212,7 +212,8 @@ public void testKanikoDeployment()   {
         assertThat(pod.getSpec().getContainers().size(), is(1));
         assertThat(pod.getSpec().getContainers().get(0).getArgs(), is(defaultKanikoArgs));
         assertThat(pod.getSpec().getContainers().get(0).getName(), is(KafkaConnectResources.buildPodName(this.cluster)));
-        assertThat(pod.getSpec().getContainers().get(0).getImage(), is(build.image));
+        // TODO: use configuration from the `ClusterOperatorConfig` rather than from env variables directly - https://github.com/strimzi/strimzi-kafka-operator/issues/11981
+        assertThat(pod.getSpec().getContainers().get(0).getImage(), is(KafkaConnectBuild.DEFAULT_KANIKO_EXECUTOR_IMAGE));
         assertThat(pod.getSpec().getContainers().get(0).getPorts(), is(nullValue()));
         assertThat(pod.getSpec().getContainers().get(0).getResources().getLimits(), is(limit));
         assertThat(pod.getSpec().getContainers().get(0).getResources().getRequests(), is(request));
@@ -283,7 +284,8 @@ public void testBuildahDeployment() {
         assertThat(commands[0], containsString(defaultBuildahBuildArgs));
         assertThat(commands[1], containsString(defaultBuildahPushArgs));
         assertThat(pod.getSpec().getContainers().get(0).getName(), is(KafkaConnectResources.buildPodName(this.cluster)));
-        assertThat(pod.getSpec().getContainers().get(0).getImage(), is(build.image));
+        // TODO: use configuration from the `ClusterOperatorConfig` rather than from env variables directly - https://github.com/strimzi/strimzi-kafka-operator/issues/11981
+        assertThat(pod.getSpec().getContainers().get(0).getImage(), is(KafkaConnectBuild.DEFAULT_BUILDAH_IMAGE));
         assertThat(pod.getSpec().getContainers().get(0).getPorts(), is(nullValue()));
         assertThat(pod.getSpec().getContainers().get(0).getResources().getLimits(), is(limit));
         assertThat(pod.getSpec().getContainers().get(0).getResources().getRequests(), is(request));

documentation/modules/appendix_crds.adoc

@@ -3106,10 +3106,10 @@ It must have the value `docker` for the type `DockerOutput`.
 |**The `additionalKanikoOptions` property has been deprecated, and should now be configured using `.spec.build.output.additionalBuildOptions`.** The `additionalKanikoOptions` configuration is deprecated and will be removed in the `v1` CRD API. 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.
 |additionalBuildOptions
 |string array
-|Configures additional options which will be passed either to Kaniko or Buildah `build` command (depending on feature gate) when building the new Connect image. Allowed Kaniko 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. Allowed Buildah `build` options are: --authfile, --cert-dir, --creds, --decryption-key, --retry, --retry-delay, --tls-verify. Those will be used only on Kubernetes, where Kaniko and Buildah are used. They will be ignored on OpenShift. The Kaniko options are described in the link:https://github.com/GoogleContainerTools/kaniko[Kaniko GitHub repository^]. The Buildah options are described in the link:https://github.com/containers/buildah/blob/main/docs/buildah-build.1.md[Buildah build document^]. Changing this field does not trigger new build of the Kafka Connect image.
+|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
 |string array
-|Configures additional options which will be passed to the Buildah `push` when pushing the new Connect image. Allowed options are: --authfile, --cert-dir, --creds, --quiet, --retry, --retry-delay, --tls-verify. Those will be used only on Kubernetes, where Buildah is used. They will be ignored on OpenShift. The options are described in the link:https://github.com/containers/buildah/blob/main/docs/buildah-push.1.md[Buildah push document^]. Changing this field does not trigger new build of the Kafka Connect image.
+|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.
 |type
 |string
 |Must be `docker`.

packaging/helm-charts/helm3/strimzi-kafka-operator/crds/041-Crd-kafkaconnect.yaml

@@ -2588,7 +2588,7 @@ spec:
                           type: array
                           items:
                             type: string
-                          description: "Configures additional options which will be passed either to Kaniko or Buildah `build` command (depending on feature gate) when building the new Connect image. Allowed Kaniko 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. Allowed Buildah `build` options are: --authfile, --cert-dir, --creds, --decryption-key, --retry, --retry-delay, --tls-verify. Those will be used only on Kubernetes, where Kaniko and Buildah are used. They will be ignored on OpenShift. The Kaniko options are described in the link:https://github.com/GoogleContainerTools/kaniko[Kaniko GitHub repository^]. The Buildah options are described in the link:https://github.com/containers/buildah/blob/main/docs/buildah-build.1.md[Buildah build document^]. 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."
                         additionalKanikoOptions:
                           type: array
                           items:
@@ -2598,7 +2598,7 @@ spec:
                           type: array
                           items:
                             type: string
-                          description: "Configures additional options which will be passed to the Buildah `push` when pushing the new Connect image. Allowed options are: --authfile, --cert-dir, --creds, --quiet, --retry, --retry-delay, --tls-verify. Those will be used only on Kubernetes, where Buildah is used. They will be ignored on OpenShift. The options are described in the link:https://github.com/containers/buildah/blob/main/docs/buildah-push.1.md[Buildah push document^]. Changing this field does not trigger new build of the Kafka Connect image."
+                          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.

packaging/install/cluster-operator/041-Crd-kafkaconnect.yaml

@@ -2587,7 +2587,7 @@ spec:
                         type: array
                         items:
                           type: string
-                        description: "Configures additional options which will be passed either to Kaniko or Buildah `build` command (depending on feature gate) when building the new Connect image. Allowed Kaniko 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. Allowed Buildah `build` options are: --authfile, --cert-dir, --creds, --decryption-key, --retry, --retry-delay, --tls-verify. Those will be used only on Kubernetes, where Kaniko and Buildah are used. They will be ignored on OpenShift. The Kaniko options are described in the link:https://github.com/GoogleContainerTools/kaniko[Kaniko GitHub repository^]. The Buildah options are described in the link:https://github.com/containers/buildah/blob/main/docs/buildah-build.1.md[Buildah build document^]. 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."
                       additionalKanikoOptions:
                         type: array
                         items:
@@ -2597,7 +2597,7 @@ spec:
                         type: array
                         items:
                           type: string
-                        description: "Configures additional options which will be passed to the Buildah `push` when pushing the new Connect image. Allowed options are: --authfile, --cert-dir, --creds, --quiet, --retry, --retry-delay, --tls-verify. Those will be used only on Kubernetes, where Buildah is used. They will be ignored on OpenShift. The options are described in the link:https://github.com/containers/buildah/blob/main/docs/buildah-push.1.md[Buildah push document^]. Changing this field does not trigger new build of the Kafka Connect image."
+                        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.