K8SPXC-1342 community bundle generation. #1843
Open
+1,213
−6
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…rcona-xtradb-cluster-operator into K8SPXC-1342_bundle_generation
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
nmarukovich
requested review from
tplavcic,
ptankov,
eleo007,
hors,
egegunes,
inelpandzic and
pooknull
as code owners
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
|
@jvpasinatto could you please review? @nmarukovich could you please fix conflicts? |
…rcona-xtradb-cluster-operator into K8SPXC-1342_bundle_generation
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
| # https://github.com/redhat-openshift-ecosystem/certification-releases/blob/main/4.9/ga/troubleshooting.md#get-supported-versions | ||
| file_name='percona-xtradb-cluster-operator' | ||
|
|
||
| if [ ${MODE} == "cluster" ]; then |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| if [ ${MODE} == "cluster" ]; then | |
| if [ "${MODE}" == "cluster" ]; then |
| mode="Cluster" | ||
| rulesLevel="ClusterPermissions" | ||
|
|
||
| elif [ ${MODE} == "namespace" ]; then |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| elif [ ${MODE} == "namespace" ]; then | |
| elif [ "${MODE}" == "namespace" ]; then |
| .annotations["com.redhat.openshift.versions"] = env(openshift_supported_versions)' \ | ||
| bundle.annotations.yaml >"${bundle_directory}/metadata/annotations.yaml" | ||
|
|
||
| if [ ${DISTRIBUTION} == 'community' ]; then |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| if [ ${DISTRIBUTION} == 'community' ]; then | |
| if [ "${DISTRIBUTION}" == 'community' ]; then |
| "${bundle_directory}/metadata/annotations.yaml" | ||
|
|
||
| # certified-operators | ||
| elif [ ${DISTRIBUTION} == 'redhat' ]; then |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| elif [ ${DISTRIBUTION} == 'redhat' ]; then | |
| elif [ "${DISTRIBUTION}" == 'redhat' ]; then |
| "${bundle_directory}/metadata/annotations.yaml" | ||
|
|
||
| # redhat-marketplace | ||
| elif [ ${DISTRIBUTION} == 'marketplace' ]; then |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| elif [ ${DISTRIBUTION} == 'marketplace' ]; then | |
| elif [ "${DISTRIBUTION}" == 'marketplace' ]; then |
| .spec.install.spec.deployments = [( env(deployment) | .[] |{ "name": .metadata.name, "spec": .spec} )] | | ||
| .spec.minKubeVersion = env(minKubeVer)' bundle.csv.yaml >"${bundle_directory}/manifests/${file_name}.clusterserviceversion.yaml" | ||
|
|
||
| if [ ${DISTRIBUTION} == "community" ]; then |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| if [ ${DISTRIBUTION} == "community" ]; then | |
| if [ "${DISTRIBUTION}" == "community" ]; then |
| if [ ${DISTRIBUTION} == "community" ]; then | ||
| update_yaml_images "bundles/$DISTRIBUTION/manifests/${file_name}.clusterserviceversion.yaml" | ||
|
|
||
| elif [ ${DISTRIBUTION} == "redhat" ]; then |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| elif [ ${DISTRIBUTION} == "redhat" ]; then | |
| elif [ "${DISTRIBUTION}" == "redhat" ]; then |
| .metadata.name = strenv(name_certified)' \ | ||
| "${bundle_directory}/manifests/${file_name}.clusterserviceversion.yaml" | ||
|
|
||
| elif [ ${DISTRIBUTION} == "marketplace" ]; then |
There was a problem hiding this comment.
[shellcheck (suggestion)] reported by reviewdog 🐶
Suggested change
| elif [ ${DISTRIBUTION} == "marketplace" ]; then | |
| elif [ "${DISTRIBUTION}" == "marketplace" ]; then |
| fi | ||
|
|
||
| update_yaml_images() { | ||
| local yaml_file="$1" |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| local yaml_file="$1" | |
| local yaml_file="$1" |
Comment on lines
+42
to
+45
| if [ ! -f "$yaml_file" ]; then | ||
| echo "Error: File '$yaml_file' does not exist." | ||
| return 1 | ||
| fi |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| if [ ! -f "$yaml_file" ]; then | |
| echo "Error: File '$yaml_file' does not exist." | |
| return 1 | |
| fi | |
| if [ ! -f "$yaml_file" ]; then | |
| echo "Error: File '$yaml_file' does not exist." | |
| return 1 | |
| fi |
| return 1 | ||
| fi | ||
|
|
||
| local temp_file=$(mktemp) |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| local temp_file=$(mktemp) | |
| local temp_file=$(mktemp) |
Comment on lines
+49
to
+50
| sed -E 's/(("image":|containerImage:|image:)[ ]*"?)([^"]+)("?)/\1docker.io\/\3\4/g' "$yaml_file" > "$temp_file" | ||
| mv "$temp_file" "$yaml_file" |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| sed -E 's/(("image":|containerImage:|image:)[ ]*"?)([^"]+)("?)/\1docker.io\/\3\4/g' "$yaml_file" > "$temp_file" | |
| mv "$temp_file" "$yaml_file" | |
| sed -E 's/(("image":|containerImage:|image:)[ ]*"?)([^"]+)("?)/\1docker.io\/\3\4/g' "$yaml_file" >"$temp_file" | |
| mv "$temp_file" "$yaml_file" |
| sed -E 's/(("image":|containerImage:|image:)[ ]*"?)([^"]+)("?)/\1docker.io\/\3\4/g' "$yaml_file" > "$temp_file" | ||
| mv "$temp_file" "$yaml_file" | ||
|
|
||
| echo "File '$yaml_file' updated successfully." |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| echo "File '$yaml_file' updated successfully." | |
| echo "File '$yaml_file' updated successfully." |
|
|
||
| ANNOTATIONS="${labels}" envsubst <bundle.Dockerfile >"${bundle_directory}/Dockerfile" | ||
|
|
||
| awk '{gsub(/^[ \t]+/, " "); print}' "${bundle_directory}/Dockerfile" > "${bundle_directory}/Dockerfile.new" && mv "${bundle_directory}/Dockerfile.new" "${bundle_directory}/Dockerfile" |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| awk '{gsub(/^[ \t]+/, " "); print}' "${bundle_directory}/Dockerfile" > "${bundle_directory}/Dockerfile.new" && mv "${bundle_directory}/Dockerfile.new" "${bundle_directory}/Dockerfile" | |
| awk '{gsub(/^[ \t]+/, " "); print}' "${bundle_directory}/Dockerfile" >"${bundle_directory}/Dockerfile.new" && mv "${bundle_directory}/Dockerfile.new" "${bundle_directory}/Dockerfile" |
| .spec.minKubeVersion = env(minKubeVer)' bundle.csv.yaml >"${bundle_directory}/manifests/${file_name}.clusterserviceversion.yaml" | ||
|
|
||
| if [ ${DISTRIBUTION} == "community" ]; then | ||
| update_yaml_images "bundles/$DISTRIBUTION/manifests/${file_name}.clusterserviceversion.yaml" |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| update_yaml_images "bundles/$DISTRIBUTION/manifests/${file_name}.clusterserviceversion.yaml" | |
| update_yaml_images "bundles/$DISTRIBUTION/manifests/${file_name}.clusterserviceversion.yaml" |
| # delete blank lines. | ||
| sed -i '' '/^$/d' "${bundle_directory}/manifests/${file_name}.clusterserviceversion.yaml" | ||
|
|
||
| if >/dev/null command -v tree; then tree -C "${bundle_directory}"; fi |
There was a problem hiding this comment.
[shfmt] reported by reviewdog 🐶
Suggested change
| if >/dev/null command -v tree; then tree -C "${bundle_directory}"; fi | |
| if >/dev/null command -v tree; then tree -C "${bundle_directory}"; fi |
commit: a8f6c52 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CHANGE DESCRIPTION
Problem:
Short explanation of the problem.
community bundle generation.
Cause:
Short explanation of the root cause of the issue if applicable.
Solution:
Short explanation of the solution we are providing with this PR.
CHECKLIST
Jira
Needs Doc) and QA (Needs QA)?Tests
compare/*-oc.yml)?Config/Logging/Testability