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.

Sign up for GitHub

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

Jump to bottom

Ensure update-istio.sh updates version field in versions.yaml #72

Merged
merged 1 commit into from
Apr 23, 2024
Merged

Ensure update-istio.sh updates version field in versions.yaml #72

merged 1 commit into from
Apr 23, 2024

Conversation

luksa
Copy link
Contributor

@luksa luksa commented Apr 23, 2024

No description provided.

@luksa luksa requested a review from a team as a code owner April 23, 2024 09:59
dgn
dgn reviewed Apr 23, 2024
View reviewed changes
Copy link
Collaborator

@dgn dgn left a comment

Choose a reason for hiding this comment

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

it won't solve the problem for latest, right? there the version is 1.22-alpha

@luksa
Copy link
Contributor Author

luksa commented Apr 23, 2024

No, this is specifically for latest. Latest now has the version 1.23-alpha.

@luksa
Ensure update-istio.sh updates version field in versions.yaml
610c21e 
Signed-off-by: Marko Lukša <mluksa@redhat.com>
@luksa luksa force-pushed the fix-update-istio branch from ded6337 to 610c21e Compare April 23, 2024 10:05
dgn
dgn approved these changes Apr 23, 2024
View reviewed changes
Copy link
Collaborator

@dgn dgn left a comment

Choose a reason for hiding this comment

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

sorry, misunderstanding on my part. LGTM

@istio-testing istio-testing merged commit bbf9379 into istio-ecosystem:main Apr 23, 2024
8 checks passed
@luksa luksa deleted the fix-update-istio branch April 23, 2024 13:45
@ericvn ericvn mentioned this pull request Apr 23, 2024
Merged
dgn pushed a commit to dgn/sail-operator that referenced this pull request Apr 23, 2024
Automated merge
25c38db 
* upstream/main:
  Refactor (istio-ecosystem#76)
  Make bundle generation work during merges (istio-ecosystem#73)
  Wrap errors to provide context (istio-ecosystem#68)
  Ensure update-istio.sh updates version field in versions.yaml (istio-ecosystem#72)
  Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (istio-ecosystem#71)
  Ensure CI highlights failure in lint-watches.sh (istio-ecosystem#70)
  Update SetDefaultEventuallyTimeout for e2e test (istio-ecosystem#69)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#66)
  Ensure control plane is deployed immediately when the target namespace is created (istio-ecosystem#65)
  Use INFO level to log missing namespace in IstioRevision/IstioCNI (istio-ecosystem#64)

Signed-off-by: openshift-service-mesh-bot <null>

# Conflicts:
#	bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Apr 24, 2024
Automated merge
84dceba 
* upstream/main:
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#67)
  Refactor (openshift-service-mesh#76)
  Make bundle generation work during merges (openshift-service-mesh#73)
  Wrap errors to provide context (openshift-service-mesh#68)
  Ensure update-istio.sh updates version field in versions.yaml (openshift-service-mesh#72)
  Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (openshift-service-mesh#71)
  Ensure CI highlights failure in lint-watches.sh (openshift-service-mesh#70)
  Update SetDefaultEventuallyTimeout for e2e test (openshift-service-mesh#69)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#66)
  Ensure control plane is deployed immediately when the target namespace is created (openshift-service-mesh#65)
  Use INFO level to log missing namespace in IstioRevision/IstioCNI (openshift-service-mesh#64)

# Conflicts:
#	bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Apr 24, 2024
Automated merge
d11f4ed 
* upstream/main:
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#67)
  Refactor (openshift-service-mesh#76)
  Make bundle generation work during merges (openshift-service-mesh#73)
  Wrap errors to provide context (openshift-service-mesh#68)
  Ensure update-istio.sh updates version field in versions.yaml (openshift-service-mesh#72)
  Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (openshift-service-mesh#71)
  Ensure CI highlights failure in lint-watches.sh (openshift-service-mesh#70)
  Update SetDefaultEventuallyTimeout for e2e test (openshift-service-mesh#69)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#66)
  Ensure control plane is deployed immediately when the target namespace is created (openshift-service-mesh#65)
  Use INFO level to log missing namespace in IstioRevision/IstioCNI (openshift-service-mesh#64)

# Conflicts:
#	bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
openshift-merge-bot bot referenced this pull request in openshift-service-mesh/sail-operator Apr 24, 2024
@openshift-service-mesh-bot @luksa
@istio-testing @fjglira @dgn
Automator: merge upstream changes to openshift-service-mesh/sail-oper…
f747b18 
…ator@main (#17)

* Use INFO level to log missing namespace in IstioRevision/IstioCNI (#64)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Ensure control plane is deployed immediately when the target namespace is created (#65)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Automator: Update dependencies in istio-ecosystem/sail-operator@main (#66)

Signed-off-by: istio-testing <istio-testing-bot@google.com>

* Update SetDefaultEventuallyTimeout for e2e test (#69)

Signed-off-by: frherrer <frherrer@redhat.com>

* Ensure CI highlights failure in lint-watches.sh (#70)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (#71)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Ensure update-istio.sh updates version field in versions.yaml (#72)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Wrap errors to provide context (#68)

* Wrap errors to provide context

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Add called function instead of the caller to error message

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Fix lint errors

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Fix test

Signed-off-by: Marko Lukša <mluksa@redhat.com>

---------

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Make bundle generation work during merges (#73)

This is required for #14

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

* Refactor (#76)

* Merge if statements

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Replace multiple ifs with switch

Signed-off-by: Marko Lukša <mluksa@redhat.com>

---------

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Automator: Update dependencies in istio-ecosystem/sail-operator@main (#67)

Signed-off-by: istio-testing <istio-testing-bot@google.com>

---------

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: istio-testing <istio-testing-bot@google.com>
Signed-off-by: frherrer <frherrer@redhat.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
Co-authored-by: Marko Lukša <mluksa@redhat.com>
Co-authored-by: Istio Automation <istio-testing-bot@google.com>
Co-authored-by: Francisco Herrera <frherrer@redhat.com>
Co-authored-by: Daniel Grimm <dgrimm@redhat.com>
Co-authored-by: openshift-service-mesh-bot <null>
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Apr 24, 2024
Automated merge
f3dc5ae 
* upstream/main:
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#67)
  Refactor (openshift-service-mesh#76)
  Make bundle generation work during merges (openshift-service-mesh#73)
  Wrap errors to provide context (openshift-service-mesh#68)
  Ensure update-istio.sh updates version field in versions.yaml (openshift-service-mesh#72)
  Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (openshift-service-mesh#71)
  Ensure CI highlights failure in lint-watches.sh (openshift-service-mesh#70)
  Update SetDefaultEventuallyTimeout for e2e test (openshift-service-mesh#69)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#66)
  Ensure control plane is deployed immediately when the target namespace is created (openshift-service-mesh#65)
  Use INFO level to log missing namespace in IstioRevision/IstioCNI (openshift-service-mesh#64)

# Conflicts:
#	bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
openshift-merge-bot bot referenced this pull request in openshift-service-mesh/sail-operator Apr 24, 2024
@openshift-service-mesh-bot @luksa
@istio-testing @fjglira @dgn
Automator: merge upstream changes to openshift-service-mesh/sail-oper…
8106820 
…ator@main (#18)

* Use INFO level to log missing namespace in IstioRevision/IstioCNI (#64)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Ensure control plane is deployed immediately when the target namespace is created (#65)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Automator: Update dependencies in istio-ecosystem/sail-operator@main (#66)

Signed-off-by: istio-testing <istio-testing-bot@google.com>

* Update SetDefaultEventuallyTimeout for e2e test (#69)

Signed-off-by: frherrer <frherrer@redhat.com>

* Ensure CI highlights failure in lint-watches.sh (#70)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (#71)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Ensure update-istio.sh updates version field in versions.yaml (#72)

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Wrap errors to provide context (#68)

* Wrap errors to provide context

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Add called function instead of the caller to error message

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Fix lint errors

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Fix test

Signed-off-by: Marko Lukša <mluksa@redhat.com>

---------

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Make bundle generation work during merges (#73)

This is required for #14

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

* Refactor (#76)

* Merge if statements

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Replace multiple ifs with switch

Signed-off-by: Marko Lukša <mluksa@redhat.com>

---------

Signed-off-by: Marko Lukša <mluksa@redhat.com>

* Automator: Update dependencies in istio-ecosystem/sail-operator@main (#67)

Signed-off-by: istio-testing <istio-testing-bot@google.com>

---------

Signed-off-by: Marko Lukša <mluksa@redhat.com>
Signed-off-by: istio-testing <istio-testing-bot@google.com>
Signed-off-by: frherrer <frherrer@redhat.com>
Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
Co-authored-by: Marko Lukša <mluksa@redhat.com>
Co-authored-by: Istio Automation <istio-testing-bot@google.com>
Co-authored-by: Francisco Herrera <frherrer@redhat.com>
Co-authored-by: Daniel Grimm <dgrimm@redhat.com>
Co-authored-by: openshift-service-mesh-bot <null>
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Apr 24, 2024
Automated merge
3466170 
* upstream/main:
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#67)
  Refactor (openshift-service-mesh#76)
  Make bundle generation work during merges (openshift-service-mesh#73)
  Wrap errors to provide context (openshift-service-mesh#68)
  Ensure update-istio.sh updates version field in versions.yaml (openshift-service-mesh#72)
  Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (openshift-service-mesh#71)
  Ensure CI highlights failure in lint-watches.sh (openshift-service-mesh#70)
  Update SetDefaultEventuallyTimeout for e2e test (openshift-service-mesh#69)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#66)
  Ensure control plane is deployed immediately when the target namespace is created (openshift-service-mesh#65)
  Use INFO level to log missing namespace in IstioRevision/IstioCNI (openshift-service-mesh#64)

# Conflicts:
#	bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Apr 24, 2024
Automated merge
ef1b412 
* upstream/main:
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#67)
  Refactor (openshift-service-mesh#76)
  Make bundle generation work during merges (openshift-service-mesh#73)
  Wrap errors to provide context (openshift-service-mesh#68)
  Ensure update-istio.sh updates version field in versions.yaml (openshift-service-mesh#72)
  Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (openshift-service-mesh#71)
  Ensure CI highlights failure in lint-watches.sh (openshift-service-mesh#70)
  Update SetDefaultEventuallyTimeout for e2e test (openshift-service-mesh#69)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#66)
  Ensure control plane is deployed immediately when the target namespace is created (openshift-service-mesh#65)
  Use INFO level to log missing namespace in IstioRevision/IstioCNI (openshift-service-mesh#64)

# Conflicts:
#	bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Apr 29, 2024
Automated merge
da758b4 
* upstream/main:
  Don't log error when namespace is being deleted (openshift-service-mesh#88)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#89)
  Introduce a central way to get the project's root directory (openshift-service-mesh#83)
  Remove duplicates of oneMinuteAgo() (openshift-service-mesh#82)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#81)
  Deploy CNI DaemonSet immediately when namespace is created (openshift-service-mesh#80)
  Remove unused fields from BaseConfig (openshift-service-mesh#79)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#77)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#67)
  Refactor (openshift-service-mesh#76)
  Make bundle generation work during merges (openshift-service-mesh#73)
  Wrap errors to provide context (openshift-service-mesh#68)
  Ensure update-istio.sh updates version field in versions.yaml (openshift-service-mesh#72)
  Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (openshift-service-mesh#71)
  Ensure CI highlights failure in lint-watches.sh (openshift-service-mesh#70)
  Update SetDefaultEventuallyTimeout for e2e test (openshift-service-mesh#69)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#66)
  Ensure control plane is deployed immediately when the target namespace is created (openshift-service-mesh#65)
  Use INFO level to log missing namespace in IstioRevision/IstioCNI (openshift-service-mesh#64)

# Conflicts:
#	bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
openshift-service-mesh-bot referenced this pull request in openshift-service-mesh-bot/sail-operator Apr 29, 2024
Automated merge
3677788 
* upstream/main:
  Don't log error when namespace is being deleted (openshift-service-mesh#88)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#89)
  Introduce a central way to get the project's root directory (openshift-service-mesh#83)
  Remove duplicates of oneMinuteAgo() (openshift-service-mesh#82)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#81)
  Deploy CNI DaemonSet immediately when namespace is created (openshift-service-mesh#80)
  Remove unused fields from BaseConfig (openshift-service-mesh#79)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#77)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#67)
  Refactor (openshift-service-mesh#76)
  Make bundle generation work during merges (openshift-service-mesh#73)
  Wrap errors to provide context (openshift-service-mesh#68)
  Ensure update-istio.sh updates version field in versions.yaml (openshift-service-mesh#72)
  Make lint-watches ignore ValidatingAdmissionPolicy(Binding) (openshift-service-mesh#71)
  Ensure CI highlights failure in lint-watches.sh (openshift-service-mesh#70)
  Update SetDefaultEventuallyTimeout for e2e test (openshift-service-mesh#69)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (openshift-service-mesh#66)
  Ensure control plane is deployed immediately when the target namespace is created (openshift-service-mesh#65)
  Use INFO level to log missing namespace in IstioRevision/IstioCNI (openshift-service-mesh#64)

# Conflicts:
#	bundle/manifests/servicemeshoperator3.clusterserviceversion.yaml
fjglira pushed a commit to fjglira/sail-operator that referenced this pull request Jul 15, 2024
@openshift-merge-bot
Merge pull request istio-ecosystem#72 from openshift-service-mesh-bot…
3649761 
…/none-main-merge_upstream_main-38a843ce

Automator: merge upstream changes to openshift-service-mesh/sail-operator@main
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dgn dgn dgn approved these changes

Assignees
No one assigned
Labels
size/XS
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@luksa @dgn @istio-testing