From 467d58ccba3e5c1a4d3cb70791d972250785d7e1 Mon Sep 17 00:00:00 2001 From: Eric Deandrea Date: Mon, 15 May 2023 11:55:22 -0400 Subject: [PATCH] Don't generate init external init tasks --- rest-fights/src/main/resources/application.properties | 2 ++ scripts/generate-k8s-resources.sh | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/rest-fights/src/main/resources/application.properties b/rest-fights/src/main/resources/application.properties index 05109d1b1..14708e66e 100644 --- a/rest-fights/src/main/resources/application.properties +++ b/rest-fights/src/main/resources/application.properties @@ -84,6 +84,7 @@ quarkus.kubernetes-client.generate-rbac=false %kubernetes-17.quarkus.config.profile.parent=kubernetes %kubernetes-17.quarkus.docker.dockerfile-jvm-path=${paths.dockerfile.jvm-17} quarkus.kubernetes.part-of=fights-service +quarkus.kubernetes.externalize-init=false quarkus.kubernetes.env.configmaps=${quarkus.application.name}-config quarkus.kubernetes.env.secrets=${quarkus.application.name}-config-creds quarkus.kubernetes.annotations."app.openshift.io/connects-to"=fights-db,fights-kafka,apicurio,rest-villains,rest-heroes,otel-collector @@ -99,6 +100,7 @@ quarkus.kubernetes.labels.system=quarkus-super-heroes %openshift-17.quarkus.docker.dockerfile-jvm-path=${paths.dockerfile.jvm-17} %openshift-17.quarkus.openshift.jvm-dockerfile=${paths.dockerfile.jvm-17} %openshift-17.quarkus.openshift.base-jvm-image=${paths.base-image.jvm-17} +quarkus.openshift.externalize-init=false quarkus.openshift.base-jvm-image=${paths.base-image.jvm-11} quarkus.openshift.base-native-image=${paths.base-image.native} quarkus.openshift.part-of=${quarkus.kubernetes.part-of} diff --git a/scripts/generate-k8s-resources.sh b/scripts/generate-k8s-resources.sh index 9d57fbebd..d22ba9838 100755 --- a/scripts/generate-k8s-resources.sh +++ b/scripts/generate-k8s-resources.sh @@ -94,10 +94,6 @@ process_quarkus_project() { if [[ -f "$app_generated_input_file" ]]; then echo "Copying app generated input ($app_generated_input_file) to $project_output_file and $all_apps_output_file" - # This is a temporary fix until https://github.com/quarkusio/quarkus/issues/33097 is resolved - yq -i 'del(select(.kind == "DeploymentConfig" and .metadata.name == "rest-fights") | .spec.template.spec.initContainers)' $app_generated_input_file && - yq -i 'del(select(.kind == "Job" and .metadata.name == "liquibase-mongodb-init"))' $app_generated_input_file - cat $app_generated_input_file >> $project_output_file cat $app_generated_input_file >> $all_apps_output_file fi