Skip to content

Commit df9bf58

Browse files
im-kongeim-konge
authored
Add Buildah as a replacement of Kaniko after its archival (strimzi#11919)
Signed-off-by: Lukas Kral <lukywill16@gmail.com>
1 parent 5cbc705 commit df9bf58

36 files changed

Lines changed: 734 additions & 159 deletions

File tree

‎.azure/templates/jobs/system-tests/feature_gates_regression_jobs.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
display_name: 'feature-gates-regression-bundle I. - kafka + oauth'
66
profile: 'azp_kafka_oauth'
77
cluster_operator_install_type: 'yaml'
8-
strimzi_feature_gates: '+ServerSideApplyPhase1'
8+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
99
timeout: 360
1010
releaseVersion: '${{ parameters.releaseVersion }}'
1111
kafkaVersion: '${{ parameters.kafkaVersion }}'
@@ -16,7 +16,7 @@ jobs:
1616
display_name: 'feature-gates-regression-bundle II. - security'
1717
profile: 'azp_security'
1818
cluster_operator_install_type: 'yaml'
19-
strimzi_feature_gates: '+ServerSideApplyPhase1'
19+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
2020
timeout: 360
2121
releaseVersion: '${{ parameters.releaseVersion }}'
2222
kafkaVersion: '${{ parameters.kafkaVersion }}'
@@ -27,7 +27,7 @@ jobs:
2727
display_name: 'feature-gates-regression-bundle III. - dynconfig + tracing + watcher'
2828
profile: 'azp_dynconfig_listeners_tracing_watcher'
2929
cluster_operator_install_type: 'yaml'
30-
strimzi_feature_gates: '+ServerSideApplyPhase1'
30+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
3131
timeout: 360
3232
releaseVersion: '${{ parameters.releaseVersion }}'
3333
kafkaVersion: '${{ parameters.kafkaVersion }}'
@@ -38,7 +38,7 @@ jobs:
3838
display_name: 'feature-gates-regression-bundle IV. - operators'
3939
profile: 'azp_operators'
4040
cluster_operator_install_type: 'yaml'
41-
strimzi_feature_gates: '+ServerSideApplyPhase1'
41+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
4242
timeout: 360
4343
releaseVersion: '${{ parameters.releaseVersion }}'
4444
kafkaVersion: '${{ parameters.kafkaVersion }}'
@@ -49,7 +49,7 @@ jobs:
4949
display_name: 'feature-gates-regression-bundle V. - rollingupdate'
5050
profile: 'azp_rolling_update_bridge'
5151
cluster_operator_install_type: 'yaml'
52-
strimzi_feature_gates: '+ServerSideApplyPhase1'
52+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
5353
timeout: 360
5454
releaseVersion: '${{ parameters.releaseVersion }}'
5555
kafkaVersion: '${{ parameters.kafkaVersion }}'
@@ -60,7 +60,7 @@ jobs:
6060
display_name: 'feature-gates-regression-bundle VI. - connect + mirrormaker'
6161
profile: 'azp_connect_mirrormaker'
6262
cluster_operator_install_type: 'yaml'
63-
strimzi_feature_gates: '+ServerSideApplyPhase1'
63+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
6464
timeout: 360
6565
releaseVersion: '${{ parameters.releaseVersion }}'
6666
kafkaVersion: '${{ parameters.kafkaVersion }}'
@@ -71,7 +71,7 @@ jobs:
7171
display_name: 'feature-gates-regression-bundle VII. - logging + specific'
7272
profile: 'azp_logging_specific'
7373
cluster_operator_install_type: 'yaml'
74-
strimzi_feature_gates: '+ServerSideApplyPhase1'
74+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
7575
timeout: 360
7676
releaseVersion: '${{ parameters.releaseVersion }}'
7777
kafkaVersion: '${{ parameters.kafkaVersion }}'
@@ -82,7 +82,7 @@ jobs:
8282
display_name: 'feature-gates-regression-bundle VIII. - remaining system tests'
8383
profile: 'azp_remaining'
8484
cluster_operator_install_type: 'yaml'
85-
strimzi_feature_gates: '+ServerSideApplyPhase1'
85+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
8686
timeout: 360
8787
releaseVersion: '${{ parameters.releaseVersion }}'
8888
kafkaVersion: '${{ parameters.kafkaVersion }}'

‎.azure/templates/jobs/system-tests/feature_gates_regression_namespace_rbac_jobs.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
cluster_operator_install_type: 'yaml'
99
timeout: 360
1010
strimzi_rbac_scope: NAMESPACE
11-
strimzi_feature_gates: '+ServerSideApplyPhase1'
11+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
1212
releaseVersion: '${{ parameters.releaseVersion }}'
1313
kafkaVersion: '${{ parameters.kafkaVersion }}'
1414

@@ -21,7 +21,7 @@ jobs:
2121
cluster_operator_install_type: 'yaml'
2222
timeout: 360
2323
strimzi_rbac_scope: NAMESPACE
24-
strimzi_feature_gates: '+ServerSideApplyPhase1'
24+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
2525
releaseVersion: '${{ parameters.releaseVersion }}'
2626
kafkaVersion: '${{ parameters.kafkaVersion }}'
2727

@@ -34,7 +34,7 @@ jobs:
3434
cluster_operator_install_type: 'yaml'
3535
timeout: 360
3636
strimzi_rbac_scope: NAMESPACE
37-
strimzi_feature_gates: '+ServerSideApplyPhase1'
37+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
3838
releaseVersion: '${{ parameters.releaseVersion }}'
3939
kafkaVersion: '${{ parameters.kafkaVersion }}'
4040

@@ -47,7 +47,7 @@ jobs:
4747
cluster_operator_install_type: 'yaml'
4848
timeout: 360
4949
strimzi_rbac_scope: NAMESPACE
50-
strimzi_feature_gates: '+ServerSideApplyPhase1'
50+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
5151
releaseVersion: '${{ parameters.releaseVersion }}'
5252
kafkaVersion: '${{ parameters.kafkaVersion }}'
5353

@@ -60,7 +60,7 @@ jobs:
6060
cluster_operator_install_type: 'yaml'
6161
timeout: 360
6262
strimzi_rbac_scope: NAMESPACE
63-
strimzi_feature_gates: '+ServerSideApplyPhase1'
63+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
6464
releaseVersion: '${{ parameters.releaseVersion }}'
6565
kafkaVersion: '${{ parameters.kafkaVersion }}'
6666

@@ -73,7 +73,7 @@ jobs:
7373
cluster_operator_install_type: 'yaml'
7474
timeout: 360
7575
strimzi_rbac_scope: NAMESPACE
76-
strimzi_feature_gates: '+ServerSideApplyPhase1'
76+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
7777
releaseVersion: '${{ parameters.releaseVersion }}'
7878
kafkaVersion: '${{ parameters.kafkaVersion }}'
7979

@@ -86,6 +86,6 @@ jobs:
8686
cluster_operator_install_type: 'yaml'
8787
timeout: 360
8888
strimzi_rbac_scope: NAMESPACE
89-
strimzi_feature_gates: '+ServerSideApplyPhase1'
89+
strimzi_feature_gates: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah'
9090
releaseVersion: '${{ parameters.releaseVersion }}'
9191
kafkaVersion: '${{ parameters.kafkaVersion }}'

‎.github/actions/systemtests/generate-matrix/pipelines.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ pipelines:
342342
pipeline: "regression-fg"
343343
profile: "brokers-and-security"
344344
timeout: 480
345-
strimzi_feature_gates: "+DummyFeatureGate"
345+
strimzi_feature_gates: "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah"
346346
strimzi_rbac_scope: "CLUSTER"
347347
cluster_operator_install_type: "yaml"
348348
parallel: 3
@@ -351,7 +351,7 @@ pipelines:
351351
pipeline: "regression-fg"
352352
profile: "operators"
353353
timeout: 480
354-
strimzi_feature_gates: "+DummyFeatureGate"
354+
strimzi_feature_gates: "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah"
355355
strimzi_rbac_scope: "CLUSTER"
356356
cluster_operator_install_type: "yaml"
357357
parallel: 4
@@ -360,7 +360,7 @@ pipelines:
360360
pipeline: "regression-fg"
361361
profile: "operands"
362362
timeout: 480
363-
strimzi_feature_gates: "+DummyFeatureGate"
363+
strimzi_feature_gates: "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah"
364364
strimzi_rbac_scope: "CLUSTER"
365365
cluster_operator_install_type: "yaml"
366366
parallel: 3
@@ -370,7 +370,7 @@ pipelines:
370370
pipeline: "regression-fg"
371371
profile: "brokers-and-security"
372372
timeout: 480
373-
strimzi_feature_gates: "+DummyFeatureGate"
373+
strimzi_feature_gates: "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah"
374374
strimzi_rbac_scope: "CLUSTER"
375375
cluster_operator_install_type: "yaml"
376376
parallel: 4
@@ -379,7 +379,7 @@ pipelines:
379379
pipeline: "regression-fg"
380380
profile: "operators"
381381
timeout: 480
382-
strimzi_feature_gates: "+DummyFeatureGate"
382+
strimzi_feature_gates: "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah"
383383
strimzi_rbac_scope: "CLUSTER"
384384
cluster_operator_install_type: "yaml"
385385
parallel: 4
@@ -388,7 +388,7 @@ pipelines:
388388
pipeline: "regression-fg"
389389
profile: "operands"
390390
timeout: 480
391-
strimzi_feature_gates: "+DummyFeatureGate"
391+
strimzi_feature_gates: "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah"
392392
strimzi_rbac_scope: "CLUSTER"
393393
cluster_operator_install_type: "yaml"
394394
parallel: 4

‎.github/actions/systemtests/parse-comment/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ runs:
143143
const DEFAULTS = {
144144
pipelines: '',
145145
profiles: '',
146-
featureGate: '+DummyFeatureGate',
146+
featureGate: '+ServerSideApplyPhase1,+UseConnectBuildWithBuildah',
147147
rbacScope: 'CLUSTER',
148148
installType: 'yaml',
149149
parallel: '1',

‎.github/tests/expected/generate-matrix/matrix_profiles_expected.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"pipeline": "regression-fg",
5454
"profile": "operators",
5555
"timeout": 480,
56-
"strimzi_feature_gates": "+DummyFeatureGate",
56+
"strimzi_feature_gates": "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah",
5757
"strimzi_rbac_scope": "CLUSTER",
5858
"cluster_operator_install_type": "yaml",
5959
"parallel": 4,
@@ -65,7 +65,7 @@
6565
"pipeline": "regression-fg",
6666
"profile": "operators",
6767
"timeout": 480,
68-
"strimzi_feature_gates": "+DummyFeatureGate",
68+
"strimzi_feature_gates": "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah",
6969
"strimzi_rbac_scope": "CLUSTER",
7070
"cluster_operator_install_type": "yaml",
7171
"parallel": 4,
@@ -77,7 +77,7 @@
7777
"pipeline": "regression-fg",
7878
"profile": "brokers-and-security",
7979
"timeout": 480,
80-
"strimzi_feature_gates": "+DummyFeatureGate",
80+
"strimzi_feature_gates": "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah",
8181
"strimzi_rbac_scope": "CLUSTER",
8282
"cluster_operator_install_type": "yaml",
8383
"parallel": 3,
@@ -89,7 +89,7 @@
8989
"pipeline": "regression-fg",
9090
"profile": "brokers-and-security",
9191
"timeout": 480,
92-
"strimzi_feature_gates": "+DummyFeatureGate",
92+
"strimzi_feature_gates": "+ServerSideApplyPhase1,+UseConnectBuildWithBuildah",
9393
"strimzi_rbac_scope": "CLUSTER",
9494
"cluster_operator_install_type": "yaml",
9595
"parallel": 4,

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
* New fields `.spec.groupId`, `.spec.configStorageTopic`, `.spec.offsetStorageTopic`, and `.spec.statusStorageTopic` in the `KafkaConnect` custom resource for configuring Connect's group ID and internal topics.
88
* New way of defining the target (`.spec.target`) and source clusters (`.spec.mirrors[].source`) in the `KafkaMirrorMaker2` custom resources.
99
* Strimzi Access Operator installation files updated to version 0.2.0
10+
* New feature gate `UseConnectBuildWithBuildah` (disabled by default) for running the Connect Build feature with Buildah instead of Kaniko on Kubernetes - according to [Strimzi Proposal #114](https://github.com/strimzi/proposals/blob/main/114-use-buildah-instead-of-kaniko.md).
1011

1112
### Major changes, deprecations, and removals
1213

@@ -24,6 +25,8 @@
2425
* The `.spec.connectCluster`, `.spec.clusters`, `.spec.mirrors[].sourceCluster`, `.spec.mirrors[].targetCluster`, and `.spec.mirrors[].heartbeatConnector` fields of the `KafkaMirrorMaker2` resource are deprecated and will be removed in the `v1` CRD API.
2526
Please use the new fields `.spec.target` and `.spec.mirrors[].source` instead to configure the source and target clusters.
2627
If you want to deploy and run the Heartbeat connector, you can use separate `KafkaConnect` and `KafkaConnector` custom resources.
28+
* The `.spec.build.output.additionalKanikoOptions` field in the `KafkaConnect` custom resource is deprecated and will be removed in the future.
29+
* Use `.spec.build.output.additionalBuildOptions` field instead.
2730

2831
## 0.48.0
2932

‎Makefile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ifneq ($(RELEASE_VERSION),latest)
1515
endif
1616

1717
SUBDIRS=kafka-agent tracing-agent crd-annotations test crd-generator api mockkube certificate-manager operator-common config-model config-model-generator cluster-operator topic-operator user-operator kafka-init systemtest docker-images/artifacts packaging/helm-charts/helm3 packaging/install packaging/examples
18-
DOCKERDIRS=docker-images/base docker-images/operator docker-images/kafka-based docker-images/maven-builder docker-images/kaniko-executor
18+
DOCKERDIRS=docker-images/base docker-images/operator docker-images/kafka-based docker-images/maven-builder docker-images/kaniko-executor docker-images/buildah
1919
DOCKER_TARGETS=docker_build docker_push docker_tag docker_load docker_save docker_amend_manifest docker_push_manifest docker_sign_manifest docker_delete_manifest docker_delete_archive docker_sbom docker_push_sbom docker_e2e docker_gha_sign_manifest docker_gha_sbom docker_gha_push_sbom
2020
JAVA_TARGETS=java_build java_install java_clean
2121

@@ -59,6 +59,7 @@ release_version:
5959
$(FIND) ./packaging/install -name '*.yaml' -type f -exec $(SED) -i '/value: "\?quay.io\/strimzi\/kafka:[a-zA-Z0-9_.-]\+"\?/s/quay.io\/strimzi\/kafka:[a-zA-Z0-9_.-]\+-kafka-\([0-9.]\+\)/quay.io\/strimzi\/kafka:$(RELEASE_VERSION)-kafka-\1/g' {} \;
6060
$(FIND) ./packaging/install -name '*.yaml' -type f -exec $(SED) -i '/[0-9.]\+=quay.io\/strimzi\/kafka[a-zA-Z0-9_.-]\?\+:[a-zA-Z0-9_.-]\+-kafka-[0-9.]\+"\?/s/:[a-zA-Z0-9_.-]\+-kafka-\([0-9.]\+\)/:$(RELEASE_VERSION)-kafka-\1/g' {} \;
6161
$(FIND) ./packaging/install -name '*.yaml' -type f -exec $(SED) -i '/value: "\?quay.io\/strimzi\/kaniko-executor:[a-zA-Z0-9_.-]\+"\?/s/quay.io\/strimzi\/kaniko-executor:[a-zA-Z0-9_.-]\+/quay.io\/strimzi\/kaniko-executor:$(RELEASE_VERSION)/g' {} \;
62+
$(FIND) ./packaging/install -name '*.yaml' -type f -exec $(SED) -i '/value: "\?quay.io\/strimzi\/buildah:[a-zA-Z0-9_.-]\+"\?/s/quay.io\/strimzi\/buildah:[a-zA-Z0-9_.-]\+/quay.io\/strimzi\/buildah:$(RELEASE_VERSION)/g' {} \;
6263
$(FIND) ./packaging/install -name '*.yaml' -type f -exec $(SED) -i '/value: "\?quay.io\/strimzi\/maven-builder:[a-zA-Z0-9_.-]\+"\?/s/quay.io\/strimzi\/maven-builder:[a-zA-Z0-9_.-]\+/quay.io\/strimzi\/maven-builder:$(RELEASE_VERSION)/g' {} \;
6364
# Set Kafka Bridge version to its own version
6465
$(FIND) ./packaging/install -name '*.yaml' -type f -exec $(SED) -i '/value: "\?quay.io\/strimzi\/kafka-bridge:[a-zA-Z0-9_.-]\+"\?/s/quay.io\/strimzi\/kafka-bridge:[a-zA-Z0-9_.-]\+/quay.io\/strimzi\/kafka-bridge:$(BRIDGE_VERSION)/g' {} \;

‎api/src/main/java/io/strimzi/api/kafka/model/connect/build/DockerOutput.java‎

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
import com.fasterxml.jackson.annotation.JsonInclude;
88
import com.fasterxml.jackson.annotation.JsonProperty;
99
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
10+
import io.strimzi.api.annotations.DeprecatedProperty;
1011
import io.strimzi.api.kafka.model.common.Constants;
1112
import io.strimzi.crdgenerator.annotations.Description;
13+
import io.strimzi.crdgenerator.annotations.PresentInVersions;
1214
import io.sundr.builder.annotations.Buildable;
1315
import lombok.EqualsAndHashCode;
1416
import lombok.ToString;
@@ -23,7 +25,7 @@
2325
builderPackage = Constants.FABRIC8_KUBERNETES_API
2426
)
2527
@JsonInclude(JsonInclude.Include.NON_NULL)
26-
@JsonPropertyOrder({ "image", "pushSecret", "additionalKanikoOptions", "type" })
28+
@JsonPropertyOrder({ "image", "pushSecret", "additionalKanikoOptions", "additionalBuildOptions", "additionalPushOptions", "type" })
2729
@EqualsAndHashCode(callSuper = true)
2830
@ToString(callSuper = true)
2931
public class DockerOutput extends Output {
@@ -33,8 +35,13 @@ public class DockerOutput extends Output {
3335
"--skip-tls-verify, --skip-tls-verify-pull, --skip-tls-verify-registry, --verbosity, --snapshotMode, " +
3436
"--use-new-run, --registry-certificate, --registry-client-cert, --ignore-path";
3537

38+
public static final String ALLOWED_BUILDAH_BUILD_OPTIONS = "--authfile, --cert-dir, --creds, --decryption-key, --retry, --retry-delay, --tls-verify";
39+
public static final String ALLOWED_BUILDAH_PUSH_OPTIONS = "--authfile, --cert-dir, --creds, --quiet, --retry, --retry-delay, --tls-verify";
40+
3641
private String pushSecret;
3742
private List<String> additionalKanikoOptions;
43+
private List<String> additionalBuildOptions;
44+
private List<String> additionalPushOptions;
3845

3946
@Description("Must be `" + TYPE_DOCKER + "`")
4047
@JsonInclude(JsonInclude.Include.NON_NULL)
@@ -64,6 +71,10 @@ public void setPushSecret(String pushSecret) {
6471
this.pushSecret = pushSecret;
6572
}
6673

74+
@Deprecated
75+
@DeprecatedProperty(movedToPath = ".spec.build.output.additionalBuildOptions",
76+
description = "The `additionalKanikoOptions` configuration is deprecated and will be removed in the `v1` CRD API.")
77+
@PresentInVersions("v1beta2")
6778
@Description("Configures additional options which will be passed to the Kaniko executor when building the new Connect image. " +
6879
"Allowed options are: " + ALLOWED_KANIKO_OPTIONS + ". " +
6980
"These options will be used only on Kubernetes where the Kaniko executor is used. " +
@@ -78,4 +89,37 @@ public List<String> getAdditionalKanikoOptions() {
7889
public void setAdditionalKanikoOptions(List<String> additionalKanikoOptions) {
7990
this.additionalKanikoOptions = additionalKanikoOptions;
8091
}
92+
93+
@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. " +
94+
"Allowed Kaniko options: " + ALLOWED_KANIKO_OPTIONS + ". " +
95+
"Allowed Buildah `build` options: " + ALLOWED_BUILDAH_BUILD_OPTIONS + ". " +
96+
"Those options are used only on Kubernetes, where Kaniko and Buildah are available. " +
97+
"They are ignored on OpenShift. " +
98+
"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^]. " +
99+
"Changing this field does not trigger a rebuild of the Kafka Connect image."
100+
)
101+
@JsonInclude(JsonInclude.Include.NON_NULL)
102+
public List<String> getAdditionalBuildOptions() {
103+
return additionalBuildOptions;
104+
}
105+
106+
public void setAdditionalBuildOptions(List<String> additionalBuildOptions) {
107+
this.additionalBuildOptions = additionalBuildOptions;
108+
}
109+
110+
@Description("Configures additional options to pass to the Buildah `push` command when pushing a new Connect image. " +
111+
"Allowed options: " + ALLOWED_BUILDAH_PUSH_OPTIONS + ". " +
112+
"Those options are used only on Kubernetes, where Buildah is available. " +
113+
"They are ignored on OpenShift. " +
114+
"For more information, see the link:https://github.com/containers/buildah/blob/main/docs/buildah-push.1.md[Buildah push document^]. " +
115+
"Changing this field does not trigger a rebuild of the Kafka Connect image."
116+
)
117+
@JsonInclude(JsonInclude.Include.NON_NULL)
118+
public List<String> getAdditionalPushOptions() {
119+
return additionalPushOptions;
120+
}
121+
122+
public void setAdditionalPushOptions(List<String> additionalPushOptions) {
123+
this.additionalPushOptions = additionalPushOptions;
124+
}
81125
}

‎api/src/main/java/io/strimzi/plugin/security/profiles/PodSecurityProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,12 +253,12 @@ default SecurityContext kafkaConnectInitContainerSecurityContext(ContainerSecuri
253253

254254

255255
/**
256-
* Provides the Pod security context for the Kafka Connect Build (Kaniko) pod. The default implementation just returns
256+
* Provides the Pod security context for the Kafka Connect Build (Kaniko/Buildah) pod. The default implementation just returns
257257
* the security context configured by the user in the template section or null (no Pod security context).
258258
*
259259
* @param context Provides the context which can be used to generate the Pod security context
260260
*
261-
* @return Pod security context which will be set for the Kafka Connect Build (Kaniko) pod
261+
* @return Pod security context which will be set for the Kafka Connect Build (Kaniko/Buildah) pod
262262
*/
263263
default PodSecurityContext kafkaConnectBuildPodSecurityContext(PodSecurityProviderContext context) {
264264
return podSecurityContextOrNull(context);

0 commit comments

Comments
 (0)