tdiesler commented on code in PR #15017:
URL: https://github.com/apache/camel/pull/15017#discussion_r1711255483
##########
dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java:
##########
@@ -260,51 +260,30 @@ public Integer export() throws Exception {
if (container.getImagePullPolicy() != null) {
var imagePullPolicy = container.getImagePullPolicy().getValue();
- if (runtime == RuntimeType.quarkus) {
- imagePullPolicy =
StringHelper.camelCaseToDash(imagePullPolicy);
- }
buildProperties.add("%s.kubernetes.image-pull-policy=%s".formatted(propPrefix,
imagePullPolicy));
}
// Quarkus Runtime specific
if (runtime == RuntimeType.quarkus) {
// Quarkus specific dependencies
+ // [TODO] migrate to JKube
if (clusterType != null && clusterType.equals("openshift")) {
addDependencies("io.quarkus:quarkus-openshift");
if (imageBuilder == null) {
// use s2i image builder as a default on OpenShift
imageBuilder = "s2i";
}
- } else {
- addDependencies("io.quarkus:quarkus-kubernetes");
Review Comment:
Yes, the idea was that independent of runtime there is just one way on
configuring k8s/openshift resources. The Openshift related code that is
currently marked as TODO is untested legacy (which could also be removed in
this PR). Support for Openshift will come back with
[CAMEL-21013](https://issues.apache.org/jira/browse/CAMEL-21013), also
uniformly through JKube.
##########
dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/main/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExport.java:
##########
@@ -260,51 +260,30 @@ public Integer export() throws Exception {
if (container.getImagePullPolicy() != null) {
var imagePullPolicy = container.getImagePullPolicy().getValue();
- if (runtime == RuntimeType.quarkus) {
- imagePullPolicy =
StringHelper.camelCaseToDash(imagePullPolicy);
- }
buildProperties.add("%s.kubernetes.image-pull-policy=%s".formatted(propPrefix,
imagePullPolicy));
}
// Quarkus Runtime specific
if (runtime == RuntimeType.quarkus) {
// Quarkus specific dependencies
+ // [TODO] migrate to JKube
if (clusterType != null && clusterType.equals("openshift")) {
addDependencies("io.quarkus:quarkus-openshift");
if (imageBuilder == null) {
// use s2i image builder as a default on OpenShift
imageBuilder = "s2i";
}
- } else {
- addDependencies("io.quarkus:quarkus-kubernetes");
Review Comment:
Yes, the idea was that independent of runtime there is just one way of
configuring k8s/openshift resources. The Openshift related code that is
currently marked as TODO is untested legacy (which could also be removed in
this PR). Support for Openshift will come back with
[CAMEL-21013](https://issues.apache.org/jira/browse/CAMEL-21013), also
uniformly through JKube.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@camel.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
