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

[SRVLOGIC-287] Recreate Operator/Bundle files dropped from upstream in midstream #34

Merged
merged 8 commits into from
May 14, 2024

Conversation

rgdoliveira
Copy link
Member

Description of the change:

Motivation for the change:

Checklist

  • Add or Modify a unit test for your change
  • Have you verified that tall the tests are passing?
How to backport a pull request to a different branch?

In order to automatically create a backporting pull request please add one or more labels having the following format backport-<branch-name>, where <branch-name> is the name of the branch where the pull request must be backported to (e.g., backport-7.67.x to backport the original PR to the 7.67.x branch).

NOTE: backporting is an action aiming to move a change (usually a commit) from a branch (usually the main one) to another one, which is generally referring to a still maintained release branch. Keeping it simple: it is about to move a specific change or a set of them from one branch to another.

Once the original pull request is successfully merged, the automated action will create one backporting pull request per each label (with the previous format) that has been added.

If something goes wrong, the author will be notified and at this point a manual backporting is needed.

NOTE: this automated backporting is triggered whenever a pull request on main branch is labeled or closed, but both conditions must be satisfied to get the new PR created.

- schema_version: 1
name: "operator-builder"
version: "1.32.0"
from: "registry.access.redhat.com/ubi8/go-toolset:1.20.12"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ricardozanini as we talked in the meeting today, I bumped to 1.20.12

@@ -0,0 +1,23 @@
apiVersion: v1
data:
DEFAULT_BUILDER_RESOURCE_NAME: Dockerfile
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think I've removed this line, but we can fix this if after this PR gets merged. Ideally, the logic-* files should be copied from the upstream part and apply a template overriding prod unique info.

@wmedvede
Copy link
Member

wmedvede commented May 14, 2024

@rgdoliveira e2e failing test might be related with the fact that the swf-builder image is now updated to quarkus 3.8.4.
And to handle this upate I have created this PR: #42 .

So, maybe we need to:

  1. Merge Update operator managed persistence extensions to quarkus 3.8.4 #42 when green.
  2. Rebase this PR with main and see if we get the e2e greens.

Current persistence related failure.

Summarizing 1 Failure:
[FAIL] Validate the persistence when deploying a SonataFlow CR with PostgreSQL persistence [It] defined in the workflow from an existing kubernetes service as a reference

Files/Folders were renamed in midstream to:
 - Makefile.osl -> Makefile.prod
 - bundle.osl -> bundle.prod
 - config/default/osl -> config/default/prod
 - config/manifests/osl -> config/manifests/prod
 - config/manager/osl/ -> config/manager/prod
Files/Folders were renamed in midstream to:
 - osl-image-prod.yaml -> prod-operator-image.yaml
 - osl-bundle-prod.yaml -> prod-bundle-image.yaml
 - images/modules/org.kie.kogito.osl.builder.prod -> images/modules/org.kie.kogito.prod.builder
@wmedvede
Copy link
Member

@rgdoliveira greens!

@rgdoliveira rgdoliveira merged commit b924f34 into kiegroup:main May 14, 2024
4 checks passed
rgdoliveira added a commit that referenced this pull request May 15, 2024
…n midstream (#34) (#43)

* Recreate Makefile osl and osl folders

Files/Folders were renamed in midstream to:
 - Makefile.osl -> Makefile.prod
 - bundle.osl -> bundle.prod
 - config/default/osl -> config/default/prod
 - config/manifests/osl -> config/manifests/prod
 - config/manager/osl/ -> config/manager/prod

* Recreate cekit descriptors and cachito prod module

Files/Folders were renamed in midstream to:
 - osl-image-prod.yaml -> prod-operator-image.yaml
 - osl-bundle-prod.yaml -> prod-bundle-image.yaml
 - images/modules/org.kie.kogito.osl.builder.prod -> images/modules/org.kie.kogito.prod.builder

* fix paths after folders renaming

* set versions to 1.32.0

* recreate prod bundle module

* use com.redhat.osl prefix for prod modules name

* add missing headers

* update go-toolset image to 1.20.12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants