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

Implement API and CRD for ztunnel component #481

Merged
merged 14 commits into from
Dec 4, 2024

Conversation

yxun
Copy link
Contributor

@yxun yxun commented Nov 19, 2024

  • Enhancement / New Feature
  • Bug Fix
  • Refactor
  • Optimization
  • Test
  • Documentation Update

What this PR does / why we need it:

Hello, this is an initial draft of installing Istio Ambient ztunnel component using Sail Operator.
This PR includes a Sail Enhancement Proposal (SEP) (SEP3-ambient-mode.md) and inital CRD and API implementations.

We want to have an early review of the SEP3 proposal and we are working on new controller implementations next.

Related Issue/PR #
https://issues.redhat.com/browse/OSSM-8381

@yxun yxun requested a review from a team as a code owner November 19, 2024 20:56
@istio-testing
Copy link
Collaborator

Hi @yxun. 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.

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.

@yxun yxun changed the title OSSM-8381: Implement API and CRD for ztunnel component WIP: OSSM-8381: Implement API and CRD for ztunnel component Nov 19, 2024
Copy link
Contributor

@sridhargaddam sridhargaddam left a comment

Choose a reason for hiding this comment

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

Thanks @yxun for the PR.

api/v1alpha1/istioztunnel_types.go Outdated Show resolved Hide resolved
enhancements/SEP3-ambient-mode.md Outdated Show resolved Hide resolved
enhancements/SEP3-ambient-mode.md Outdated Show resolved Hide resolved
enhancements/SEP3-ambient-mode.md Outdated Show resolved Hide resolved
enhancements/SEP3-ambient-mode.md Outdated Show resolved Hide resolved
enhancements/SEP3-ambient-mode.md Outdated Show resolved Hide resolved
enhancements/SEP3-ambient-mode.md Outdated Show resolved Hide resolved
enhancements/SEP3-ambient-mode.md Outdated Show resolved Hide resolved
enhancements/SEP3-ambient-mode.md Outdated Show resolved Hide resolved
### Backward Compatibility

### Kubernetes vs OpenShift vs Other Distributions

Copy link
Contributor

Choose a reason for hiding this comment

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

Ideally, when using the Ambient profile on OCP, we expect users to specify "profile: openshift-ambient". However, AFAIR, in the Sail Operator, we autodiscover the platform and configure the profile accordingly. We can use the same approach for the Ambient mode as well.

We can however, mention that on OpenShift, users can configure the profile to "openshift-ambient"

Copy link
Contributor

@luksa luksa Nov 21, 2024

Choose a reason for hiding this comment

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

Setting profile: ambient should suffice, as openshift is now a so-called platform profile. Platform profiles are orthogonal to the user-selected profiles, and are applied automatically based on values.platform field (which the Sail operator sets automatically).

Copy link
Contributor

Choose a reason for hiding this comment

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

Just curious: ztunnel is only applicable in Ambient mode, so do we really require users to specify profile (as platform details are now separated)?

Copy link
Contributor

Choose a reason for hiding this comment

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

You're right. The profile field in ZTunnel should default to ambient. Users don't need to specify it, but they can, if they want to use another profile (not applicable yet, but eventually we'll probably support user-provided profiles just like upstream).

Signed-off-by: Yuanlin Xu <[email protected]>
Signed-off-by: Yuanlin Xu <[email protected]>
@yxun yxun changed the title WIP: OSSM-8381: Implement API and CRD for ztunnel component OSSM-8381: Implement API and CRD for ztunnel component Nov 25, 2024
@yxun
Copy link
Contributor Author

yxun commented Nov 25, 2024

Currently, ZTunnelConfig and ZTunnelGlobalConfig structs are defined in the types_extra.go.
I am working on an upstream Istio change about those two. After that, I will remove those two in the Sail Operator API types_extra.go and then our transformer tool can pull those from upstream to types.gen.go.

@yxun yxun changed the title OSSM-8381: Implement API and CRD for ztunnel component WIP: OSSM-8381: Implement API and CRD for ztunnel component Nov 25, 2024
@yxun yxun changed the title WIP: OSSM-8381: Implement API and CRD for ztunnel component OSSM-8381: Implement API and CRD for ztunnel component Nov 25, 2024
@sridhargaddam
Copy link
Contributor

Currently, ZTunnelConfig and ZTunnelGlobalConfig structs are defined in the types_extra.go. I am working on an upstream Istio change about those two. After that, I will remove those two in the Sail Operator API types_extra.go and then our transformer tool can pull those from upstream to types.gen.go.

Thanks @yxun.
@luksa can you please take a look and if you are okay with the changes, please approve. This is basically to unblock the controller work and once we have the upstream changes ready, we will revert the changes done to types_extra.go.

Copy link
Contributor

@luksa luksa left a comment

Choose a reason for hiding this comment

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

A few comments. Also, please add ZTunnel to the PROJECT file. Without this, some gen scripts don't work properly.

api/v1alpha1/ztunnel_types.go Outdated Show resolved Hide resolved
api/v1alpha1/ztunnel_types.go Show resolved Hide resolved
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

// +kubebuilder:default={version: "v1.24.0", namespace: "kube-system"}
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
// +kubebuilder:default={version: "v1.24.0", namespace: "kube-system"}
// +kubebuilder:default={version: "v1.24.0", namespace: "kube-system", profile: "ambient"}


// Namespace to which the Istio ztunnel component should be installed.
// +operator-sdk:csv:customresourcedefinitions:type=spec,xDescriptors={"urn:alm:descriptor:io.kubernetes:Namespace"}
// +kubebuilder:default=kube-system
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this correct? Do we want to deploy ztunnel to kube-system? For IstioCNI we use istio-cni instead of kube-system.

Copy link
Contributor

Choose a reason for hiding this comment

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

In upstream, its installed by default in kube-system, but I think we can use even istio-cni namespace as well.

Copy link
Contributor

Choose a reason for hiding this comment

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

If we change the namespace to istio-cni, we will also have to modify the trustedZtunnelNamespace which is configured to kube-system.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Correct, I tried an installation of upstream ambient on OpenShift. By default, it does not work in istio-cni ns. It got permission error running ztunnel there. And that's also a reason why upstream added trustedZtunnelNamespace in its helm values.

Copy link
Contributor

@luksa luksa Nov 26, 2024

Choose a reason for hiding this comment

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

I don't think it's the best idea to use kube-system on OpenShift, as all the other OpenShift components intentionally use other namespaces, never kube-system.

Copy link
Contributor

@sridhargaddam sridhargaddam Nov 26, 2024

Choose a reason for hiding this comment

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

@yxun when you tried installing ztunnel in istio-cni, did you also configure trustedZtunnelNamespace to istio-cni? If so, did it work or did you notice any additional errors?

Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think it's the best idea to use kube-system on OpenShift, as all the other OpenShift components intentionally use other namespaces, never kube-system.

@luksa, I see that when using istioctl with openshift profile (i.e., non ambient use-case) the istio-cni pods are installed in the kube-system namespace itself and not in istio-cni namespace.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I updated this default namespace value in the ztunnel_types.go file.
The Helm chart profile values need to be updated from upstream if we want all openshift related profiles use trustedZtunnelNamespace: istio-cni

Copy link
Contributor

Choose a reason for hiding this comment

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

As discussed during the call yesterday, we will be installing the ztunnel CR in the ztunnel namespace and not in istio-cni. I will take care of trustedZtunnelNamespace validation/modification as part of my PR.

@luksa
Copy link
Contributor

luksa commented Nov 28, 2024

/ok-to-test

Comment on lines 48 to 50
hub: gcr.io/istio-testing
tag: latest
image: ztunnel
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this required?

hub: gcr.io/istio-testing
tag: latest
image: ztunnel
istioNamespace: istio-system
Copy link
Contributor

Choose a reason for hiding this comment

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

Hmm, if ZTunnel needs to be tied to a specific control plane, then it may not have sense for it to be deployed via a separate CRD.

Copy link
Contributor

Choose a reason for hiding this comment

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

In an Ambient deployment, the ztunnel ds pod requests the Istiod control plane to issue certificates for itself and for the workloads (on the same node) that it manages. So, it needs the information of CA_ADDRESS and XDS_ADDRESS. The lifecycle of ztunnel is different from the Istiod, but it needs details of the istiod control plane.

xdsAddress: By default, it is istiod.istio-system.svc:15012 if revision is not set, or istiod-<revision>.<istioNamespace>.svc:15012

For more details, see : https://github.com/istio/istio/blob/master/manifests/charts/ztunnel/values.yaml#L79-L89

Comment on lines 84 to 85
### Reuse `IstioCNI`'s type field for specifying a ztunnel component
We could expend the `IstioCNI` resource APIs and `IstioCNISpec` values field for a ztunnel component installation and life-cycle management. It would have the benefit that combines IstioCNI and ztunnel components together because both of them are deployed as a Kubernetes DaemonSet on each node. The disadvantage though is that it would be confusing for users to manage either IstioCNI or ztunnel life-cycle.
Copy link
Contributor

Choose a reason for hiding this comment

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

Didn't we also consider a several other options? At least the option of having ZTunnel deployed via the Istio/IstioRevision resource. It would be great to explain here why we decided against these alternative options (this is the entire point of this section).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I see. I will update that alternative options section in SEP3 and then we can discuss this proposal.

Copy link
Contributor

@luksa luksa left a comment

Choose a reason for hiding this comment

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

LGTM, but I'd move the SEP to a separate PR.

yxun added 3 commits December 4, 2024 08:39
Signed-off-by: Yuanlin Xu <[email protected]>
Signed-off-by: Yuanlin Xu <[email protected]>
@istio-testing istio-testing merged commit 3875a7c into istio-ecosystem:main Dec 4, 2024
15 checks passed
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 4, 2024
* upstream/main: (37 commits)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#482)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 4, 2024
* upstream/main: (37 commits)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#482)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 4, 2024
* upstream/main: (37 commits)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#482)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 5, 2024
* upstream/main: (37 commits)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#482)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 5, 2024
* upstream/main: (37 commits)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#482)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 5, 2024
* upstream/main: (38 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#508)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 5, 2024
* upstream/main: (38 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#508)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 5, 2024
* upstream/main: (38 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#508)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 5, 2024
* upstream/main: (38 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#508)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 5, 2024
* upstream/main: (38 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#508)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 6, 2024
* upstream/main: (38 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#508)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 6, 2024
* upstream/main: (38 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#508)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#484)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 6, 2024
* upstream/main: (39 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#510)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#508)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/clusterrole.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 6, 2024
* upstream/main: (39 commits)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#510)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#508)
  Implement API and CRD for ztunnel component (istio-ecosystem#481)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#505)
  Add documentation for running multiple meshes on a single cluster (istio-ecosystem#506)
  Remove validation when generating YAML manifests (istio-ecosystem#496)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#504)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#503)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#501)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#499)
  Revision Tag Support (istio-ecosystem#413)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#497)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#495)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#492)
  Update e2e Documentation with env var to set sample yaml files (istio-ecosystem#487)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#490)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#489)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#488)
  Centralize the way the sample apps yaml are being set to be deployed (istio-ecosystem#483)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#485)
  ...

# Conflicts:
#	api/v1alpha1/remoteistio_types.go
#	bundle/manifests/sailoperator.io_remoteistios.yaml
#	chart/crds/sailoperator.io_remoteistios.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/base/files/crd-all.gen.yaml
#	resources/latest/charts/base/files/profile-platform-k3s.yaml
#	resources/latest/charts/base/values.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/files/profile-platform-k3s.yaml
#	resources/latest/charts/cni/templates/clusterrole.yaml
#	resources/latest/charts/cni/templates/configmap-cni.yaml
#	resources/latest/charts/cni/templates/daemonset.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/files/injection-template.yaml
#	resources/latest/charts/istiod/files/profile-platform-k3s.yaml
#	resources/latest/charts/istiod/files/waypoint.yaml
#	resources/latest/charts/istiod/templates/serviceaccount.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/files/profile-platform-k3s.yaml
#	resources/latest/charts/ztunnel/templates/daemonset.yaml
#	resources/latest/charts/ztunnel/templates/rbac.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/default.yaml
#	resources/v1.24.0/charts/base/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/cni/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/gateway/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/istiod/files/profile-compatibility-version-1.21.yaml
#	resources/v1.24.0/charts/ztunnel/files/profile-compatibility-version-1.21.yaml
dgn added a commit to dgn/sail-operator that referenced this pull request Dec 11, 2024
dgn added a commit to dgn/sail-operator that referenced this pull request Dec 11, 2024
dgn added a commit to dgn/sail-operator that referenced this pull request Dec 11, 2024
istio-testing pushed a commit that referenced this pull request Dec 11, 2024
openshift-service-mesh-bot pushed a commit to openshift-service-mesh-bot/sail-operator that referenced this pull request Dec 11, 2024
* upstream/release-0.2:
  Revert "Implement API and CRD for ztunnel component (istio-ecosystem#481)"
  Revert "Update ztunnel versions in update_version-list.sh (istio-ecosystem#509)"

# Conflicts:
#	bundle/manifests/sailoperator.clusterserviceversion.yaml
@yxun yxun deleted the eco-ambient branch January 2, 2025 18:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants