Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't generate init external init tasks #287

Merged
merged 1 commit into from
May 15, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions rest-fights/src/main/resources/application.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}
Expand Down
4 changes: 0 additions & 4 deletions scripts/generate-k8s-resources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down