ztp: CNF-11904: Update kustomize version dynamically #1906
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@irinamihai: This pull request references CNF-11904 which is a valid jira issue. In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: irinamihai The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
|
|
||
| # Extract the last openshift-gitops image. | ||
| gitops_version=$(echo $gitops_channel | grep -oE "[0-9.\]+") | ||
| gitops_image=$(cat $index_results_file | jq --arg gitops_channel "$gitops_channel" --arg gitops_version "$gitops_version" 'select(.name == $gitops_channel) | .entries[] | select(.name | contains($gitops_version)) | .name' | tail -n 1 | tail -n 1 | sed "s/\"//g") |
There was a problem hiding this comment.
Such a complicated parsing!
There was a problem hiding this comment.
It is a bit, unfortunately. I do need to get the right image through jq.
I will look into it to see if there is an easier way.
|
|
||
|
|
||
| # Render file based catalog from redhat-operator-index. | ||
| podman run --rm registry.redhat.io/redhat/redhat-operator-index:$index_tag render /configs/ > $index_results_file |
There was a problem hiding this comment.
Are images from registry.redhat.io can be accessed without authentication?
There was a problem hiding this comment.
No, but AFAIK prow can pull from registry.redhat.io 🤔
irinamihai
force-pushed
the
11901-dynamic-kustomize-version
branch
from
c954b9f
to
47f326c
Compare
|
/cc @vitus133 |
|
|
||
| # Extract the last openshift-gitops image. | ||
| gitops_version=$(echo $gitops_channel | grep -oE "[0-9.\]+") | ||
| gitops_image=$(cat $index_results_file | jq --arg gitops_channel "$gitops_channel" --arg gitops_version "$gitops_version" 'select(.name == $gitops_channel) | .entries[] | select(.name | contains($gitops_version)) | .name' | tail -n 1 | sed "s/\"//g") |
There was a problem hiding this comment.
You can tell jq to print the result without the double quotes by using '-r' or '--raw-output' option (also below).
| # of the current openshift-gitops operator. | ||
|
|
||
| # Check for empty parameters. | ||
| if [[ -z $1 || -z $2 || -z $3 || -z $4 ]]; then |
There was a problem hiding this comment.
Can it be simplified by the below?
if [[ $# -ne 4 ]]; then
ztp/gitops-subscriptions/Makefile
Outdated
| KUSTOMIZE_VERSION=4.4.0 | ||
| KUSTOMIZE_VERSION_DEFAULT=5.2.1 | ||
| KUSTOMIZE_GET_VERSION_SCRIPT=../tools/get-kustomize-version/get-gitops-operator-kustomize-version.sh | ||
| KUSTOMIZE_VERSION=$(shell ./$(KUSTOMIZE_GET_VERSION_SCRIPT) v4.16 $(GITOPS_OPERATOR_SUB_FILE) $(KUSTOMIZE_VERSION_DEFAULT) $(KUSTOMIZE_VERSION_DIR) && cat $(KUSTOMIZE_VERSION_FILE)) |
There was a problem hiding this comment.
I want to see if we can obtain v4.16 from someplace instead of hardcoding it.
There was a problem hiding this comment.
May be at least worth putting it in its own variable at the top of the makefile with a note that it needs to be kept up to date?
There was a problem hiding this comment.
Idea: Check the current git branch; If it's "release-.*" assume "v${branchname#release-}" is the OCP version. Otherwise fall back to some hard-coded default?
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
| } | ||
|
|
||
| # Check the second parameter points to a file that exists. | ||
| if ! test -f $2; then |
There was a problem hiding this comment.
if [[ ! -f $2 ]]; then is more traditional
| fi | ||
|
|
||
| # Extract the latest desired openshift-gitops channel. | ||
| gitops_channel=$(cat $openshift_gitops_operator_sub | grep "channel: gitops-" | awk '{print $2}') |
There was a problem hiding this comment.
awk can also grep; you could shorten this
| gitops_channel=$(cat $openshift_gitops_operator_sub | grep "channel: gitops-" | awk '{print $2}') | |
| gitops_channel=$(cat $openshift_gitops_operator_sub | awk '/channel: gitops-/ {print $2}') |
| fi | ||
|
|
||
| # Get the kustomize version. | ||
| podman run --rm $argocd_image kustomize version | grep -oE "v[0-9.\]+" | grep -oE "[0-9.\]+" > $kustomize_version_file |
There was a problem hiding this comment.
If you changed this to just send to stdout, you wouldn't need an extra cat or an assumption about created filenames in your Makefiles above.
Description:
- update the ZTP Makefiles to dynamically determine
the kustomize version to use
- the kustomize version is obtained in a new script by:
* looking at the redhat-operator-index & rendering the catalog
* searching for the argocd image of the current gitops
operator version
(in gitops-subscriptions/argocd/deployment/
openshift-gitops-operator.yaml )
* getting the kustomize version from the argocd image
- the default kustomize version is set to 5.2.1 for 4.16
irinamihai
force-pushed
the
11901-dynamic-kustomize-version
branch
from
47f326c
to
8008b8d
Compare
irinamihai
changed the title
|
@irinamihai: The following test failed, say
Full PR test history. Your PR dashboard. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
openshift-merge-robot
added
the
needs-rebase
|
PR needs rebase. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
Description:
/cc @sabbir-47 @lack