Skip to content

Commit 6c61337

Browse files
committed
Apply more bundle fixes #2
Signed-off-by: Franco Bladilo <[email protected]>
1 parent 7ad6734 commit 6c61337

File tree

2 files changed

+49
-17
lines changed

2 files changed

+49
-17
lines changed

bundle/art.yaml

Lines changed: 48 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,38 +13,70 @@ updates:
1313
replace: "value: mta"
1414
- search: "value: konveyor"
1515
replace: "value: mta"
16-
- search: "Konveyor Operator"
17-
replace: "MTA Operator"
16+
- search: "displayName: Konveyor Operator"
17+
replace: "displayName: Migration Toolkit for Applications Operator"
1818
- search: "tackle-hub"
1919
replace: "mta-hub"
2020
- search: "name: kantra"
2121
replace: "name: mta-cli"
22+
# FIXME: We need a better way to handle these, these are MTA external dependencies that we do not build (external image refs)
2223
- search: "quay.io/sclorg/postgresql-15-c9s:latest"
2324
replace: "registry.redhat.io/rhel9/postgresql-15@sha256:8da4d3837db7dc4baaa1cc2612fe8e13b7507a4690f1ff5e5e97a26a157aa9e5"
2425
- search: "quay.io/openshift/origin-oauth-proxy:latest"
2526
replace: "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:ef10b2ecbfa0c4ac8568af9ee64ee4a554e3fdc9089ee5683b6c2c3a74caafbe"
26-
- search: "name: RELATED_IMAGE_KEYCLOAK_SSO"
27-
replace: "# name: RELATED_IMAGE_KEYCLOAK_SSO (unpinned ref)"
27+
# Keycloak is deployed downstream using rhbk operator, this is requested via dependencies.yaml
28+
- search: "- name: RELATED_IMAGE_KEYCLOAK_SSO"
29+
replace: "# - name: RELATED_IMAGE_KEYCLOAK_SSO (unused downstream)"
2830
- search: "value: quay.io/keycloak/keycloak:26.1"
29-
replace: "# value: quay.io/keycloak/keycloak:26.1 (unpinned ref)"
30-
- search: "name: RELATED_IMAGE_KEYCLOAK_INIT"
31-
replace: "# name: RELATED_IMAGE_KEYCLOAK_INIT (unpinned ref)"
31+
replace: "# value: quay.io/keycloak/keycloak:26.1 (unused downstream)"
32+
- search: "- name: RELATED_IMAGE_KEYCLOAK_INIT"
33+
replace: "# - name: RELATED_IMAGE_KEYCLOAK_INIT (unused downstream)"
3234
- search: "value: quay.io/konveyor/tackle-keycloak-init:release-0.8"
33-
replace: "# value: quay.io/konveyor/tackle-keycloak-init:release-0.8 (unpinned ref)"
34-
- search: "image: quay.io/keycloak/keycloak:26.1"
35-
replace: "# image: quay.io/keycloak/keycloak:26.1 (unpinned ref)"
36-
- search: "name: keycloak-sso"
37-
replace: "# name: keycloak-sso (unpinned ref)"
38-
- search: "image: quay.io/konveyor/tackle-keycloak-init:release-0.8"
39-
replace: "# image: quay.io/konveyor/tackle-keycloak-init:release-0.8 (unpinned ref)"
40-
- search: "name: keycloak-init"
41-
replace: "# name: keycloak-init (unpinned ref)"
35+
replace: "# value: quay.io/konveyor/tackle-keycloak-init:release-0.8 (unused downstream)"
36+
# Shouldn't these (versioning) be handled by bundle create job??
37+
- search: "version: 99.0.0"
38+
replace: "version: 8.0.99"
39+
- search: "name: konveyor-operator.v99.0.0"
40+
replace: "name: mta-operator.v8.0.99"
41+
- search: "value: 99.0.0"
42+
replace: "value: 8.0.99"
43+
# IDK where else to fix olm.SkipRange?
44+
- search: ">=0.0.0 <99.0.0"
45+
replace: ">=7.3.0 <8.0.99"
46+
- search: "features.operators.openshift.io/fips-compliant: 'false'"
47+
replace: "features.operators.openshift.io/fips-compliant: 'true'"
48+
- search: "support: https://github.com/konveyor/tackle2-operator/issues"
49+
replace: "support: Red Hat"
50+
- search: "Modernization & Migration"
51+
replace: "OpenShift Optional, Modernization & Migration"
52+
- search: "email: [email protected]"
53+
replace: "email: [email protected]"
54+
- search: "name: Konveyor Community"
55+
replace: "Red Hat"
56+
- search: "name: Konveyor"
57+
replace: "name: Red Hat"
58+
- search: "url: https://www.konveyor.io"
59+
replace: "url: https://www.redhat.com"
60+
- search: "https://konveyor.github.io/tackle"
61+
replace: "https://access.redhat.com/documentation/en-us/migration_toolkit_for_applications"
62+
- search: "name: Operator"
63+
replace: "name: Developers"
64+
- search: "url: https://github.com/konveyor/tackle2-operator"
65+
replace: "url: https://developers.redhat.com/products/mta"
4266
- search: "imagePullPolicy: Always"
4367
replace: "imagePullPolicy: IfNotPresent"
4468
- search: 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
4569
replace: PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxOTIgMTQ1Ij48ZGVmcz48c3R5bGU+LmNscy0xe2ZpbGw6I2UwMDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlJlZEhhdC1Mb2dvLUhhdC1Db2xvcjwvdGl0bGU+PHBhdGggZD0iTTE1Ny43Nyw2Mi42MWExNCwxNCwwLDAsMSwuMzEsMy40MmMwLDE0Ljg4LTE4LjEsMTcuNDYtMzAuNjEsMTcuNDZDNzguODMsODMuNDksNDIuNTMsNTMuMjYsNDIuNTMsNDRhNi40Myw2LjQzLDAsMCwxLC4yMi0xLjk0bC0zLjY2LDkuMDZhMTguNDUsMTguNDUsMCwwLDAtMS41MSw3LjMzYzAsMTguMTEsNDEsNDUuNDgsODcuNzQsNDUuNDgsMjAuNjksMCwzNi40My03Ljc2LDM2LjQzLTIxLjc3LDAtMS4wOCwwLTEuOTQtMS43My0xMC4xM1oiLz48cGF0aCBjbGFzcz0iY2xzLTEiIGQ9Ik0xMjcuNDcsODMuNDljMTIuNTEsMCwzMC42MS0yLjU4LDMwLjYxLTE3LjQ2YTE0LDE0LDAsMCwwLS4zMS0zLjQybC03LjQ1LTMyLjM2Yy0xLjcyLTcuMTItMy4yMy0xMC4zNS0xNS43My0xNi42QzEyNC44OSw4LjY5LDEwMy43Ni41LDk3LjUxLjUsOTEuNjkuNSw5MCw4LDgzLjA2LDhjLTYuNjgsMC0xMS42NC01LjYtMTcuODktNS42LTYsMC05LjkxLDQuMDktMTIuOTMsMTIuNSwwLDAtOC40MSwyMy43Mi05LjQ5LDI3LjE2QTYuNDMsNi40MywwLDAsMCw0Mi41Myw0NGMwLDkuMjIsMzYuMywzOS40NSw4NC45NCwzOS40NU0xNjAsNzIuMDdjMS43Myw4LjE5LDEuNzMsOS4wNSwxLjczLDEwLjEzLDAsMTQtMTUuNzQsMjEuNzctMzYuNDMsMjEuNzdDNzguNTQsMTA0LDM3LjU4LDc2LjYsMzcuNTgsNTguNDlhMTguNDUsMTguNDUsMCwwLDEsMS41MS03LjMzQzIyLjI3LDUyLC41LDU1LC41LDc0LjIyYzAsMzEuNDgsNzQuNTksNzAuMjgsMTMzLjY1LDcwLjI4LDQ1LjI4LDAsNTYuNy0yMC40OCw1Ni43LTM2LjY1LDAtMTIuNzItMTEtMjcuMTYtMzAuODMtMzUuNzgiLz48L3N2Zz4=
4670
- search: image/png
4771
replace: image/svg+xml
72+
- search: "Konveyor is an open-source"
73+
replace: "Migration Toolkit for Applications is an"
74+
- search: "Documentation can be found on our [website](https://konveyor.github.io/tackle)."
75+
replace: "Documentation can be found on our [website](https://access.redhat.com/documentation/en-us/migration_toolkit_for_applications)."
76+
- search: "If you encounter any issues while using Konveyor operator, you can create an issue
77+
on our [Github repo](https://github.com/konveyor/tackle2-operator/issues), for
78+
bugs, enhancements or other requests."
79+
replace: "If you encounter any issues while using Migration Toolkit for Applications Operator, create a [support case](https://access.redhat.com/support/cases/) for bugs, enhancements, or other requests."
4880
- file: "metadata/annotations.yaml"
4981
update_list:
5082
- search: konveyor-operator

bundle/mta-operator.package.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
packageName: mta-operator
33
channels:
44
- name: stable-v8.0
5-
currentCSV: mta-operator.v8.0.0
5+
currentCSV: mta-operator.v8.0.99
66
defaultChannel: stable-v8.0

0 commit comments

Comments
 (0)