Make bundle generation work during merges #73
Merged
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
This is required for openshift-service-mesh#14 Signed-off-by: Daniel Grimm <dgrimm@redhat.com>
luksa
approved these changes
Apr 23, 2024
dgn
pushed a commit
to dgn/sail-operator
that referenced
this pull request
Apr 23, 2024
* 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
* 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
* 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
…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
* 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
…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
* 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
* 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
* 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
* 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
…/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
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.
This is required for openshift-service-mesh#14