Add version alias support by yannuil · Pull Request #566 · istio-ecosystem/sail-operator

yannuil · 2025-01-21T09:32:28Z

What type of PR is this?

This PR addresses #405 .

linux-foundation-easycla · 2025-01-21T09:32:34Z

The committers listed above are authorized under a signed CLA.

✅ login: yannuil / name: Yann Liu (128e9ba, 7ccd97f, 555874e, 1310a0e, b0bdf75, f2c196a, 2fe3dd2, a65f240, 8026a64, 9de1130, 6d1734b, 9e376c5, 81742a9, 85232b1, 9b6fbdc, 9b3223a, cba6eb2, 888c46b, f48d079, 0904433, 0ead03c, 59dd0e7, 706b944, 986656c, 955d53a, 4372aab, 3d3b832, 135a8f3, 129cf69, d5e0823, a5f5741)
✅ login: dgn / name: Daniel Grimm (59e8e81, 162d786, bb206c3, cf51eeb, ce54f48)

istio-testing · 2025-01-21T09:32:44Z

Hi @yannuil. Thanks for your PR.

I'm waiting for a istio-ecosystem or istio member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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.

dgn

looks good so far. minor issues

pkg/istioversions/versions.go

tests/e2e/controlplane/control_plane_test.go

dgn · 2025-01-21T14:32:54Z

/cherry-pick release-1.0

istio-testing · 2025-01-21T14:32:57Z

@dgn: once the present PR merges, I will cherry-pick it on top of release-1.0 in a new PR and assign it to you.

Details

In response to this:

/cherry-pick release-1.0

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.

yannuil · 2025-01-21T15:16:05Z

/retest

codecov · 2025-01-22T11:04:38Z

Codecov Report

Attention: Patch coverage is 77.61194% with 15 lines in your changes missing coverage. Please review.

Project coverage is 74.41%. Comparing base (84c35a1) to head (135a8f3).
Report is 3 commits behind head on main.

Files with missing lines	Patch %	Lines
controllers/ztunnel/ztunnel_controller.go	0.00%	10 Missing ⚠️
controllers/istiocni/istiocni_controller.go	72.72%	2 Missing and 1 partial ⚠️
pkg/istioversion/version.go	95.34%	1 Missing and 1 partial ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #566      +/-   ##
==========================================
+ Coverage   74.23%   74.41%   +0.18%     
==========================================
  Files          42       42              
  Lines        2550     2584      +34     
==========================================
+ Hits         1893     1923      +30     
- Misses        564      568       +4     
  Partials       93       93

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

dgn · 2025-01-31T13:17:10Z

Making a few more additions to this to make it compatible with our community/downstream fork setup.

adding a /hold until this is ready

dgn · 2025-01-31T20:18:33Z

I made some more changes, most notably removing the latest version and just replacing it with an alias. Another thing i want to do is flatten the struct a bit - we don't need different fields for name and version IMO if they're always the same except for the v prefix

dgn · 2025-01-31T20:19:33Z

This is also now ready for consumption in the fork. We will need to move the vendor versions.yaml into the same module but apart from that the process should be unchanged. Will test this thoroughly next week to avoid having to go back and forth between community and fork.

yannuil · 2025-02-14T16:08:10Z

/test lint

yannuil · 2025-02-14T17:01:05Z

/test lint

Signed-off-by: Daniel Grimm <dgrimm@redhat.com>

dgn

lgtm, just some minor comments. Note that I added a commit fixing the update-istio script

dgn · 2025-02-17T08:39:12Z

controllers/istiocni/istiocni_controller.go


+	version, err := istioversions.ResolveVersion(cni.Spec.Version)
+	if err != nil {
+		return fmt.Errorf("failed to apply profile: %w", err)


nit: wrong error message. should be "versions %s not found" like above

I reworded all places where istionversion.Resolve is called to include more context on the resource names.

controllers/istiocni/istiocni_controller_test.go

controllers/ztunnel/ztunnel_controller.go

pkg/istioversions/versions.yaml

controllers/istio/istio_controller.go

luksa · 2025-02-17T12:12:55Z

pkg/istioversions/versions.go

+	// AliasList is the alias for the version
+	AliasList []AliasInfo


I don't think we need this anymore.

I will make it private as it is used in the TestInit for verifying if all aliases are properly referenced.

But why have code just for test purposes if the test can easily find the aliases by itself?

I agree it shouldn't be there, but let's fix it in a follow-up, I'd like to produce some RC builds

hack/update-version-list.sh

pkg/istioversions/versions.go

Signed-off-by: Yann Liu <yannliu@redhat.com>

In versions.yaml, `Ref` is now a reference to the name of a version. Signed-off-by: Yann Liu <yannliu@redhat.com>

luksa · 2025-02-17T17:31:39Z

hack/update-version-list.sh

-    ztunnelselectValues=$(yq '.versions[] | select(.version >= "1.24.0") | ", \"urn:alm:descriptor:com.tectonic.ui:select:" + .name + "\""' "${VERSIONS_YAML_FILE}" | tr -d '\n')
-    ztunnelversionsEnum=$(yq '.versions[] | select(.version >= "1.24.0") | .name' "${VERSIONS_YAML_FILE}" | tr '\n' ';' | sed 's/;$//g')
-    ztunnelversions=$(yq '.versions[] | select(.version >= "1.24.0") | .name' "${VERSIONS_YAML_FILE}" | tr '\n' ',' | sed -e 's/,/, /g' -e 's/, $//g')
+    ztunnelselectValues=$(yq '.versions[] | select(.version >= "1.24.0" or .ref >= "v1.24.0") | ", \"urn:alm:descriptor:com.tectonic.ui:select:" + .name + "\""' "${VERSIONS_YAML_PATH}" | tr -d '\n')


This .ref >= "v1.24.0" won't work correctly, but neither will the version >= "1.24.0", which was here previously.

it's not perfect but it works for the time being. I think it's okay to keep it as it is as this is only temporary anyway until pre-1.24 versions drop out of support

luksa

LGTM, but I do have a few reservations about the istioversion package. Needs refactoring; and the tests also need to be simplified and improved. Let's do this ASAP in a follow-up PR.

istio-testing · 2025-02-17T18:31:25Z

@dgn: #566 failed to apply on top of branch "release-1.0":

Applying: Refactor version management to use new istioversions package
Applying: Add alias support in istioversions
Applying: Introduce alias in the controller
Applying: Fix tests for alias
Applying: Fix version value format
Applying: Add comments to pkg/istioversions/versions.go
Applying: Support for different versions YAML files
Applying: Automatically update aliases
Applying: Remove 'latest' and create an alias called 'master'
error: mode change for resources/latest/charts/base/Chart.yaml, which is not in current HEAD
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0009 Remove 'latest' and create an alias called 'master'

Details

In response to this:

/cherry-pick release-1.0

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.

istio-testing · 2025-02-17T18:31:26Z

@dgn: new issue created for failed cherrypick: #661

Details

In response to this:

/cherry-pick release-1.0

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.

* Refactor version management to use new istioversions package - Moved supportedversion into pkg/istioversions - Embeded versions.yaml into the binary - Updated Makefile and scripts to reference the new versions.yaml location in pkg/istioversions. - Replaced instances of supportedversion with istioversions in various controller tests and integration tests. Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Add alias support in istioversions Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Introduce alias in the controller Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix tests for alias Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix version value format Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Add comments to pkg/istioversions/versions.go Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Support for different versions YAML files Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Automatically update aliases Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Remove 'latest' and create an alias called 'master' Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Include alias as part of the installation tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Resolve version name for IstioCNI and ZTunnel Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update types validation Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Apply suggestions in the reviews Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Change 'alias' to 'aliases' in version.yaml Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Skip sample pod specs when running under an alias version Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Make consistent naming Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix test style Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Change version.yaml structure Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests and rename Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Remove version alias in IstioRevision Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix a test The error was "no namespace specified" and the reconciliation of the active revision path was never entered. A namespace is added into the spec and the error in the `reconcileActiveRevision` path is triggered. Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix a rebase error Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update field name to use `ref` Signed-off-by: Yann Liu <yannliu@redhat.com> * Simplify `versions.yaml` loading logic Signed-off-by: Yann Liu <yannliu@redhat.com> * Lint Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix list_only_latest() func Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Introduce VERSIONS_YAML_PATH Signed-off-by: Yann Liu <yannliu@redhat.com> * Rename to istioversion Signed-off-by: Yann Liu <yannliu@redhat.com> * Reword error message Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix update_alias() Signed-off-by: Yann Liu <yannliu@redhat.com> * Update package path references Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix import error Signed-off-by: Yann Liu <yannliu@redhat.com> * Update versions.yaml definition In versions.yaml, `Ref` is now a reference to the name of a version. Signed-off-by: Yann Liu <yannliu@redhat.com> --------- Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: Daniel Grimm <dgrimm@redhat.com>

* Refactor version management to use new istioversions package - Moved supportedversion into pkg/istioversions - Embeded versions.yaml into the binary - Updated Makefile and scripts to reference the new versions.yaml location in pkg/istioversions. - Replaced instances of supportedversion with istioversions in various controller tests and integration tests. Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Add alias support in istioversions Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Introduce alias in the controller Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix tests for alias Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix version value format Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Add comments to pkg/istioversions/versions.go Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Support for different versions YAML files Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Automatically update aliases Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Remove 'latest' and create an alias called 'master' Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Include alias as part of the installation tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Resolve version name for IstioCNI and ZTunnel Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update types validation Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Apply suggestions in the reviews Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Change 'alias' to 'aliases' in version.yaml Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Skip sample pod specs when running under an alias version Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Make consistent naming Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix test style Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Change version.yaml structure Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests and rename Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Remove version alias in IstioRevision Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix a test The error was "no namespace specified" and the reconciliation of the active revision path was never entered. A namespace is added into the spec and the error in the `reconcileActiveRevision` path is triggered. Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix a rebase error Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update field name to use `ref` Signed-off-by: Yann Liu <yannliu@redhat.com> * Simplify `versions.yaml` loading logic Signed-off-by: Yann Liu <yannliu@redhat.com> * Lint Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix list_only_latest() func Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Introduce VERSIONS_YAML_PATH Signed-off-by: Yann Liu <yannliu@redhat.com> * Rename to istioversion Signed-off-by: Yann Liu <yannliu@redhat.com> * Reword error message Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix update_alias() Signed-off-by: Yann Liu <yannliu@redhat.com> * Update package path references Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix import error Signed-off-by: Yann Liu <yannliu@redhat.com> * Update versions.yaml definition In versions.yaml, `Ref` is now a reference to the name of a version. Signed-off-by: Yann Liu <yannliu@redhat.com> --------- Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: Daniel Grimm <dgrimm@redhat.com> Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Refactor version management to use new istioversions package - Moved supportedversion into pkg/istioversions - Embeded versions.yaml into the binary - Updated Makefile and scripts to reference the new versions.yaml location in pkg/istioversions. - Replaced instances of supportedversion with istioversions in various controller tests and integration tests. * Add alias support in istioversions * Introduce alias in the controller * Fix tests for alias * Fix version value format * Add comments to pkg/istioversions/versions.go * Support for different versions YAML files * Automatically update aliases * Remove 'latest' and create an alias called 'master' * Include alias as part of the installation tests * Update tests * Resolve version name for IstioCNI and ZTunnel * Update tests * Update types validation * Apply suggestions in the reviews * Change 'alias' to 'aliases' in version.yaml * Skip sample pod specs when running under an alias version * Make consistent naming * Fix test style * Change version.yaml structure * Update tests and rename * Fix tests * Remove version alias in IstioRevision * Fix a test The error was "no namespace specified" and the reconciliation of the active revision path was never entered. A namespace is added into the spec and the error in the `reconcileActiveRevision` path is triggered. * Fix a rebase error * Update field name to use `ref` * Simplify `versions.yaml` loading logic * Lint * Fix list_only_latest() func * Introduce VERSIONS_YAML_PATH * Rename to istioversion * Reword error message * Fix update_alias() * Update package path references * Fix import error * Update versions.yaml definition In versions.yaml, `Ref` is now a reference to the name of a version. --------- Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: Yann Liu <yannliu@redhat.com> Co-authored-by: Daniel Grimm <dgrimm@redhat.com>

* Refactor version management to use new istioversions package - Moved supportedversion into pkg/istioversions - Embeded versions.yaml into the binary - Updated Makefile and scripts to reference the new versions.yaml location in pkg/istioversions. - Replaced instances of supportedversion with istioversions in various controller tests and integration tests. Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Add alias support in istioversions Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Introduce alias in the controller Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix tests for alias Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix version value format Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Add comments to pkg/istioversions/versions.go Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Support for different versions YAML files Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Automatically update aliases Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Remove 'latest' and create an alias called 'master' Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Include alias as part of the installation tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Resolve version name for IstioCNI and ZTunnel Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update types validation Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Apply suggestions in the reviews Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Change 'alias' to 'aliases' in version.yaml Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Skip sample pod specs when running under an alias version Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Make consistent naming Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix test style Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Change version.yaml structure Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests and rename Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Remove version alias in IstioRevision Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix a test The error was "no namespace specified" and the reconciliation of the active revision path was never entered. A namespace is added into the spec and the error in the `reconcileActiveRevision` path is triggered. Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix a rebase error Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update field name to use `ref` Signed-off-by: Yann Liu <yannliu@redhat.com> * Simplify `versions.yaml` loading logic Signed-off-by: Yann Liu <yannliu@redhat.com> * Lint Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix list_only_latest() func Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Introduce VERSIONS_YAML_PATH Signed-off-by: Yann Liu <yannliu@redhat.com> * Rename to istioversion Signed-off-by: Yann Liu <yannliu@redhat.com> * Reword error message Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix update_alias() Signed-off-by: Yann Liu <yannliu@redhat.com> * Update package path references Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix import error Signed-off-by: Yann Liu <yannliu@redhat.com> * Update versions.yaml definition In versions.yaml, `Ref` is now a reference to the name of a version. Signed-off-by: Yann Liu <yannliu@redhat.com> --------- Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: Daniel Grimm <dgrimm@redhat.com> Signed-off-by: Marko Lukša <mluksa@redhat.com>

* upstream/release-1.0: Make environment variable consistent (openshift-service-mesh#664) Add multi control plane e2e tests (openshift-service-mesh#610) (openshift-service-mesh#670) Ensure e2e tests use the correct versions yaml file (openshift-service-mesh#667) (openshift-service-mesh#669) Add version alias support (openshift-service-mesh#566) (openshift-service-mesh#662) Add missing link for: Example using the RevisionBased strategy and an IstioRevisionTag # Conflicts: # bundle/manifests/sailoperator.clusterserviceversion.yaml

* upstream-eco/main: Ensure e2e tests use the correct versions yaml file (istio-ecosystem#667) Make environment variable consistent (istio-ecosystem#663) Add contributor meeting information to the contributor.md file (istio-ecosystem#623) Add version alias support (istio-ecosystem#566)

Co-authored-by: openshift-service-mesh-bot <null>

* Refactor version management to use new istioversions package - Moved supportedversion into pkg/istioversions - Embeded versions.yaml into the binary - Updated Makefile and scripts to reference the new versions.yaml location in pkg/istioversions. - Replaced instances of supportedversion with istioversions in various controller tests and integration tests. Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Add alias support in istioversions Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Introduce alias in the controller Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix tests for alias Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix version value format Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Add comments to pkg/istioversions/versions.go Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Support for different versions YAML files Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Automatically update aliases Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Remove 'latest' and create an alias called 'master' Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Include alias as part of the installation tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Resolve version name for IstioCNI and ZTunnel Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update types validation Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Apply suggestions in the reviews Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Change 'alias' to 'aliases' in version.yaml Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Skip sample pod specs when running under an alias version Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Make consistent naming Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix test style Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Change version.yaml structure Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update tests and rename Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix tests Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Remove version alias in IstioRevision Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix a test The error was "no namespace specified" and the reconciliation of the active revision path was never entered. A namespace is added into the spec and the error in the `reconcileActiveRevision` path is triggered. Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Fix a rebase error Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Update field name to use `ref` Signed-off-by: Yann Liu <yannliu@redhat.com> * Simplify `versions.yaml` loading logic Signed-off-by: Yann Liu <yannliu@redhat.com> * Lint Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix list_only_latest() func Signed-off-by: Daniel Grimm <dgrimm@redhat.com> * Introduce VERSIONS_YAML_PATH Signed-off-by: Yann Liu <yannliu@redhat.com> * Rename to istioversion Signed-off-by: Yann Liu <yannliu@redhat.com> * Reword error message Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix update_alias() Signed-off-by: Yann Liu <yannliu@redhat.com> * Update package path references Signed-off-by: Yann Liu <yannliu@redhat.com> * Fix import error Signed-off-by: Yann Liu <yannliu@redhat.com> * Update versions.yaml definition In versions.yaml, `Ref` is now a reference to the name of a version. Signed-off-by: Yann Liu <yannliu@redhat.com> --------- Signed-off-by: Yann Liu <yannliu@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com> Co-authored-by: Daniel Grimm <dgrimm@redhat.com> Signed-off-by: Daniel Grimm <dgrimm@redhat.com>

yannuil requested a review from a team as a code owner January 21, 2025 09:32

istio-testing added the size/L label Jan 21, 2025

istio-testing added the needs-ok-to-test label Jan 21, 2025

sridhargaddam added ok-to-test and removed needs-ok-to-test labels Jan 21, 2025

dgn reviewed Jan 21, 2025

View reviewed changes

pkg/istioversions/versions.go Outdated Show resolved Hide resolved

pkg/istioversions/versions.go Outdated Show resolved Hide resolved

tests/e2e/controlplane/control_plane_test.go Outdated Show resolved Hide resolved

istio-testing added the needs-rebase label Jan 22, 2025

dgn force-pushed the version-alias branch from 8906bf3 to fe3764b Compare January 31, 2025 11:08

istio-testing removed the needs-rebase label Jan 31, 2025

dgn added the do-not-merge/hold label Jan 31, 2025

istio-testing added the needs-rebase label Feb 3, 2025

dgn force-pushed the version-alias branch from 0276cd7 to db8e9b4 Compare February 3, 2025 10:41

istio-testing removed the needs-rebase label Feb 3, 2025

dgn force-pushed the version-alias branch from db8e9b4 to daf1fb8 Compare February 3, 2025 10:54

istio-testing added size/XL and removed size/L labels Feb 3, 2025

dgn force-pushed the version-alias branch 5 times, most recently from bb03a3d to 33c73bb Compare February 3, 2025 18:06

yannuil force-pushed the version-alias branch from c4aeeaa to 129cf69 Compare February 14, 2025 15:56

Fix list_only_latest() func

59e8e81

Signed-off-by: Daniel Grimm <dgrimm@redhat.com>

dgn reviewed Feb 17, 2025

View reviewed changes

luksa reviewed Feb 17, 2025

View reviewed changes

pkg/istioversions/versions.yaml Outdated Show resolved Hide resolved

luksa reviewed Feb 17, 2025

View reviewed changes

yannuil added 7 commits February 17, 2025 22:45

Introduce VERSIONS_YAML_PATH

4372aab

Signed-off-by: Yann Liu <yannliu@redhat.com>

Rename to istioversion

d5e0823

Signed-off-by: Yann Liu <yannliu@redhat.com>

Reword error message

a5f5741

Signed-off-by: Yann Liu <yannliu@redhat.com>

Fix update_alias()

986656c

Signed-off-by: Yann Liu <yannliu@redhat.com>

Update package path references

955d53a

Signed-off-by: Yann Liu <yannliu@redhat.com>

Fix import error

3d3b832

Signed-off-by: Yann Liu <yannliu@redhat.com>

Update versions.yaml definition

135a8f3

In versions.yaml, `Ref` is now a reference to the name of a version. Signed-off-by: Yann Liu <yannliu@redhat.com>

yannuil requested a review from luksa February 17, 2025 16:34

luksa reviewed Feb 17, 2025

View reviewed changes

luksa approved these changes Feb 17, 2025

View reviewed changes

istio-testing merged commit 13a1029 into istio-ecosystem:main Feb 17, 2025

istio-testing mentioned this pull request Feb 17, 2025

[release-1.0] Add version alias support #661

Closed

dgn mentioned this pull request Mar 20, 2025

Add support for version aliases #405

Closed

7 tasks

cam-garrison pushed a commit to cam-garrison/sail-operator that referenced this pull request Oct 30, 2025

[release-3.2] Automator: Update Istio module (istio-ecosystem#566)

a1a7c3f

Co-authored-by: openshift-service-mesh-bot <null>

		// AliasList is the alias for the version
		AliasList []AliasInfo

Conversation

yannuil commented Jan 21, 2025

What type of PR is this?

Uh oh!

linux-foundation-easycla bot commented Jan 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

istio-testing commented Jan 21, 2025

Uh oh!

dgn left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dgn commented Jan 21, 2025

Uh oh!

istio-testing commented Jan 21, 2025

Uh oh!

yannuil commented Jan 21, 2025

Uh oh!

codecov bot commented Jan 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

dgn commented Jan 31, 2025

Uh oh!

dgn commented Jan 31, 2025

Uh oh!

dgn commented Jan 31, 2025

Uh oh!

yannuil commented Feb 14, 2025

Uh oh!

yannuil commented Feb 14, 2025

Uh oh!

dgn left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luksa left a comment

Choose a reason for hiding this comment

Uh oh!

istio-testing commented Feb 17, 2025

Uh oh!

istio-testing commented Feb 17, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

linux-foundation-easycla bot commented Jan 21, 2025 •

edited

Loading

codecov bot commented Jan 22, 2025 •

edited

Loading