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

Remove role 1.89 and add role 2.1 from default #839

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Conversation

aljesusg
Copy link
Contributor

@aljesusg aljesusg commented Nov 6, 2024

This is required for next TP2 after release 2.1

  • Removed role 1.89
  • Updated defaults and manifests
  • Add role 2.1 from default

Copy link
Contributor

@jmazzitelli jmazzitelli left a comment

Choose a reason for hiding this comment

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

Other than the two changes to the default yaml files (see earlier comments), this looks OK. But I want to run the molecule tests on this before I approve. I will get that done in the next day or so

@jmazzitelli
Copy link
Contributor

I'm running this against my CRC (I first made those two changes I suggested above, then I did "make cluster-push" both in kiali and OSSMC repos so I get the dev images pushed):

hack/run-molecule-tests.sh --client-exe "$(which oc)" -dorp podman --cluster-type openshift -udi true -sv v2.1

Will report back the results when done. I don't expect anything to fail here, but we'll see.

@jmazzitelli
Copy link
Contributor

with these two changes:

diff --git a/playbooks/kiali-default-supported-images.yml b/playbooks/kiali-default-supported-images.yml
index ea0f562..0d593ea 100644
--- a/playbooks/kiali-default-supported-images.yml
+++ b/playbooks/kiali-default-supported-images.yml
@@ -2,4 +2,4 @@ default: {"image_name": "quay.io/kiali/kiali", "image_version": "operator_versio
 v1.57: {"image_name": "quay.io/kiali/kiali", "image_version": "v1.57"}
 v1.65: {"image_name": "quay.io/kiali/kiali", "image_version": "v1.65"}
 v1.73: {"image_name": "quay.io/kiali/kiali", "image_version": "v1.73"}
-v1.89: {"image_name": "quay.io/kiali/kiali", "image_version": "v2.1"}
+v2.1: {"image_name": "quay.io/kiali/kiali", "image_version": "v2.1"}
diff --git a/playbooks/ossmconsole-default-supported-images.yml b/playbooks/ossmconsole-default-supported-images.yml
index ec7e586..46da701 100644
--- a/playbooks/ossmconsole-default-supported-images.yml
+++ b/playbooks/ossmconsole-default-supported-images.yml
@@ -1,3 +1,3 @@
 default: {"imageName": "quay.io/kiali/ossmconsole", "imageVersion": "operator_version"}
-v1.89: {"imageName": "quay.io/kiali/ossmconsole", "imageVersion": "v2.1"}
+v2.1: {"imageName": "quay.io/kiali/ossmconsole", "imageVersion": "v2.1"}
 v1.73: {"imageName": "quay.io/kiali/ossmconsole", "imageVersion": "v1.73"}

the molecule tests pass:

=====================
=== TEST RESULTS: ===
=====================

              accessible-namespaces-test... success [7m 37s]
     affinity-tolerations-resources-test... success [3m 44s]
                cluster-wide-access-test... success [8m 30s]
                      config-values-test... success [2m 41s]
                  default-namespace-test... success [1m 59s]
                            grafana-test... success [3m 22s]
                        header-auth-test... skipped
                      instance-name-test... success [2m 20s]
                             jaeger-test... success [2m 30s]
                            metrics-test... success [3m 44s]
                     null-cr-values-test... success [1m 42s]
                only-view-only-mode-test... success [2m 35s]
                             openid-test... skipped
                   os-console-links-test... success [4m 40s]
          ossmconsole-config-values-test... success [2m 21s]
                              roles-test... success [5m 19s]
                    rolling-restart-test... success [2m 30s]
                              token-test... success [2m 3s]

Copy link
Contributor

@jmazzitelli jmazzitelli left a comment

Choose a reason for hiding this comment

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

LGTM

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.

2 participants