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

Use gcr.io for Istio images and quay.io/sail-dev for sample applications #613

Merged
merged 3 commits into from
Feb 5, 2025

Conversation

luksa
Copy link
Contributor

@luksa luksa commented Feb 5, 2025

No description provided.

Signed-off-by: Marko Lukša <[email protected]>
Copy link

codecov bot commented Feb 5, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 74.03%. Comparing base (a7a5ceb) to head (1ab5729).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #613      +/-   ##
==========================================
- Coverage   74.43%   74.03%   -0.40%     
==========================================
  Files          40       40              
  Lines        2511     2511              
==========================================
- Hits         1869     1859      -10     
- Misses        554      561       +7     
- Partials       88       91       +3     

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

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 @luksa

@luksa
Copy link
Contributor Author

luksa commented Feb 5, 2025

@sridhargaddam I guess I also need to move sleep/httpbin in the same PR.

@sridhargaddam
Copy link
Contributor

@sridhargaddam I guess I also need to move sleep/httpbin in the same PR.

We seem to be using the following images and they may not be present on the gcr.io

	envVarMap := map[string]string{
		"tcp-echo-dual-stack": "TCP_ECHO_DUAL_STACK_YAML_PATH",
		"tcp-echo-ipv4":       "TCP_ECHO_IPV4_YAML_PATH",
		"tcp-echo":            "TCP_ECHO_IPV4_YAML_PATH",
		"tcp-echo-ipv6":       "TCP_ECHO_IPV6_YAML_PATH",
		"sleep":               "SLEEP_YAML_PATH",
		"helloworld":          "HELLOWORLD_YAML_PATH",
		"sample":              "HELLOWORLD_YAML_PATH",
		"httpbin":             "HTTPBIN_YAML_PATH",
	}

@luksa luksa requested a review from sridhargaddam February 5, 2025 11:43
@luksa luksa changed the title Use gcr.io for Istio images Use gcr.io for Istio images and quay.io/sail-dev for sample applications Feb 5, 2025
@istio-testing istio-testing merged commit 586e391 into istio-ecosystem:main Feb 5, 2025
15 of 16 checks passed
@istio-testing
Copy link
Collaborator

In response to a cherrypick label: #613 failed to apply on top of branch "release-1.0":

Applying: Use gcr.io for Istio images
Using index info to reconstruct a base tree...
M	bundle/manifests/sailoperator.clusterserviceversion.yaml
A	resources/v1.21.6/charts/cni/values.yaml
A	resources/v1.21.6/charts/istiod/values.yaml
A	resources/v1.21.6/charts/revisiontags/values.yaml
A	resources/v1.21.6/charts/ztunnel/values.yaml
A	resources/v1.22.5/charts/cni/values.yaml
A	resources/v1.22.5/charts/istiod/values.yaml
A	resources/v1.22.5/charts/revisiontags/values.yaml
A	resources/v1.22.5/charts/ztunnel/values.yaml
A	resources/v1.22.6/charts/cni/values.yaml
A	resources/v1.22.6/charts/istiod/values.yaml
A	resources/v1.22.6/charts/revisiontags/values.yaml
A	resources/v1.22.6/charts/ztunnel/values.yaml
A	resources/v1.22.7/charts/cni/values.yaml
A	resources/v1.22.7/charts/istiod/values.yaml
A	resources/v1.22.7/charts/revisiontags/values.yaml
A	resources/v1.22.7/charts/ztunnel/values.yaml
A	resources/v1.22.8/charts/cni/values.yaml
A	resources/v1.22.8/charts/istiod/values.yaml
A	resources/v1.22.8/charts/revisiontags/values.yaml
A	resources/v1.22.8/charts/ztunnel/values.yaml
A	resources/v1.23.2/charts/cni/values.yaml
A	resources/v1.23.2/charts/istiod-remote/values.yaml
A	resources/v1.23.2/charts/istiod/values.yaml
A	resources/v1.23.2/charts/revisiontags/values.yaml
A	resources/v1.23.2/charts/ztunnel/values.yaml
A	resources/v1.24.0/charts/cni/values.yaml
A	resources/v1.24.0/charts/istiod/values.yaml
A	resources/v1.24.0/charts/revisiontags/values.yaml
A	resources/v1.24.0/charts/ztunnel/values.yaml
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): resources/v1.24.0/charts/ztunnel/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.24.0/charts/ztunnel/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.24.0/charts/revisiontags/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.24.0/charts/revisiontags/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.24.0/charts/istiod/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.24.0/charts/istiod/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.24.0/charts/cni/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.24.0/charts/cni/values.yaml left in tree.
Auto-merging resources/v1.23.0/charts/ztunnel/values.yaml
Auto-merging resources/v1.23.0/charts/revisiontags/values.yaml
Auto-merging resources/v1.23.0/charts/istiod/values.yaml
Auto-merging resources/v1.23.0/charts/istiod-remote/values.yaml
Auto-merging resources/v1.23.0/charts/cni/values.yaml
CONFLICT (modify/delete): resources/v1.22.8/charts/ztunnel/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.8/charts/ztunnel/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.8/charts/revisiontags/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.8/charts/revisiontags/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.8/charts/istiod/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.8/charts/istiod/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.8/charts/cni/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.8/charts/cni/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.7/charts/ztunnel/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.7/charts/ztunnel/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.7/charts/revisiontags/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.7/charts/revisiontags/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.7/charts/istiod/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.7/charts/istiod/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.7/charts/cni/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.7/charts/cni/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.6/charts/ztunnel/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.6/charts/ztunnel/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.6/charts/revisiontags/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.6/charts/revisiontags/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.6/charts/istiod/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.6/charts/istiod/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.6/charts/cni/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.6/charts/cni/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.5/charts/ztunnel/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.5/charts/ztunnel/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.5/charts/revisiontags/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.5/charts/revisiontags/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.5/charts/istiod/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.5/charts/istiod/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.22.5/charts/cni/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.22.5/charts/cni/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.21.6/charts/ztunnel/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.21.6/charts/ztunnel/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.21.6/charts/revisiontags/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.21.6/charts/revisiontags/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.21.6/charts/istiod/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.21.6/charts/istiod/values.yaml left in tree.
CONFLICT (modify/delete): resources/v1.21.6/charts/cni/values.yaml deleted in HEAD and modified in Use gcr.io for Istio images. Version Use gcr.io for Istio images of resources/v1.21.6/charts/cni/values.yaml left in tree.
Auto-merging bundle/manifests/sailoperator.clusterserviceversion.yaml
CONFLICT (content): Merge conflict in bundle/manifests/sailoperator.clusterserviceversion.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Use gcr.io for Istio images

@istio-testing
Copy link
Collaborator

In response to a cherrypick label: new issue created for failed cherrypick: #614

@luksa luksa deleted the gcr.io branch February 5, 2025 12:05
FilipB added a commit to FilipB/sail-operator that referenced this pull request Feb 7, 2025
* upstream-eco/main: (27 commits)
  Add documentation for version alias (istio-ecosystem#625)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#624)
  Capture ztunnel details on e2e failures (istio-ecosystem#618)
  [Doc] Updates to dual-stack section (istio-ecosystem#621)
  Add multi control plane e2e tests (istio-ecosystem#610)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#620)
  Add workflow to detect broken links in doc (istio-ecosystem#611)
  Add an e2e test for Ambient config in IstioCNI (istio-ecosystem#591)
  Use gcr.io for Istio images and quay.io/sail-dev for sample applications (istio-ecosystem#613)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#612)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#609)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#608)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#606)
  Helm: Remove redundant platform-specific cmd during installation (istio-ecosystem#604)
  add trigger for nightly builds of release-1.0
  bump version to 1.1.0
  Update ztunnel comment in api_transformer (istio-ecosystem#595)
  Automator: Update dependencies in istio-ecosystem/sail-operator@main (istio-ecosystem#599)
  link ambient doc in the doc/table of contents (istio-ecosystem#598)
  Add an Ambient mode documentation (istio-ecosystem#579)
  ...

# Conflicts:
#	bundle/manifests/sailoperator.clusterserviceversion.yaml
#	resources/latest/charts/base/Chart.yaml
#	resources/latest/charts/cni/Chart.yaml
#	resources/latest/charts/cni/values.yaml
#	resources/latest/charts/gateway/Chart.yaml
#	resources/latest/charts/gateway/templates/deployment.yaml
#	resources/latest/charts/istiod/Chart.yaml
#	resources/latest/charts/istiod/values.yaml
#	resources/latest/charts/revisiontags/values.yaml
#	resources/latest/charts/ztunnel/Chart.yaml
#	resources/latest/charts/ztunnel/values.yaml
#	resources/latest/profiles/ambient.yaml
#	resources/latest/profiles/default.yaml
#	resources/latest/profiles/demo.yaml
#	resources/latest/profiles/empty.yaml
#	resources/latest/profiles/openshift-ambient.yaml
#	resources/latest/profiles/openshift.yaml
#	resources/latest/profiles/preview.yaml
#	resources/latest/profiles/remote.yaml
#	resources/latest/profiles/stable.yaml
#	resources/v1.21.6/charts/cni/values.yaml
#	resources/v1.21.6/charts/istiod/values.yaml
#	resources/v1.21.6/charts/revisiontags/values.yaml
#	resources/v1.21.6/charts/ztunnel/values.yaml
#	resources/v1.21.6/profiles/ambient.yaml
#	resources/v1.21.6/profiles/default.yaml
#	resources/v1.21.6/profiles/demo.yaml
#	resources/v1.21.6/profiles/empty.yaml
#	resources/v1.21.6/profiles/external.yaml
#	resources/v1.21.6/profiles/openshift.yaml
#	resources/v1.21.6/profiles/preview.yaml
#	resources/v1.21.6/profiles/remote.yaml
#	resources/v1.22.5/charts/cni/values.yaml
#	resources/v1.22.5/charts/istiod/values.yaml
#	resources/v1.22.5/charts/revisiontags/values.yaml
#	resources/v1.22.5/charts/ztunnel/values.yaml
#	resources/v1.22.5/profiles/ambient.yaml
#	resources/v1.22.5/profiles/default.yaml
#	resources/v1.22.5/profiles/demo.yaml
#	resources/v1.22.5/profiles/empty.yaml
#	resources/v1.22.5/profiles/openshift-ambient.yaml
#	resources/v1.22.5/profiles/openshift.yaml
#	resources/v1.22.5/profiles/preview.yaml
#	resources/v1.22.5/profiles/remote.yaml
#	resources/v1.22.5/profiles/stable.yaml
#	resources/v1.22.6/charts/cni/values.yaml
#	resources/v1.22.6/charts/istiod/values.yaml
#	resources/v1.22.6/charts/revisiontags/values.yaml
#	resources/v1.22.6/charts/ztunnel/values.yaml
#	resources/v1.22.6/profiles/ambient.yaml
#	resources/v1.22.6/profiles/default.yaml
#	resources/v1.22.6/profiles/demo.yaml
#	resources/v1.22.6/profiles/empty.yaml
#	resources/v1.22.6/profiles/openshift-ambient.yaml
#	resources/v1.22.6/profiles/openshift.yaml
#	resources/v1.22.6/profiles/preview.yaml
#	resources/v1.22.6/profiles/remote.yaml
#	resources/v1.22.6/profiles/stable.yaml
#	resources/v1.22.7/charts/cni/values.yaml
#	resources/v1.22.7/charts/istiod/values.yaml
#	resources/v1.22.7/charts/revisiontags/values.yaml
#	resources/v1.22.7/charts/ztunnel/values.yaml
#	resources/v1.22.7/profiles/ambient.yaml
#	resources/v1.22.7/profiles/default.yaml
#	resources/v1.22.7/profiles/demo.yaml
#	resources/v1.22.7/profiles/empty.yaml
#	resources/v1.22.7/profiles/openshift-ambient.yaml
#	resources/v1.22.7/profiles/openshift.yaml
#	resources/v1.22.7/profiles/preview.yaml
#	resources/v1.22.7/profiles/remote.yaml
#	resources/v1.22.7/profiles/stable.yaml
#	resources/v1.22.8/charts/cni/values.yaml
#	resources/v1.22.8/charts/istiod/values.yaml
#	resources/v1.22.8/charts/revisiontags/values.yaml
#	resources/v1.22.8/charts/ztunnel/values.yaml
#	resources/v1.22.8/profiles/ambient.yaml
#	resources/v1.22.8/profiles/default.yaml
#	resources/v1.22.8/profiles/demo.yaml
#	resources/v1.22.8/profiles/empty.yaml
#	resources/v1.22.8/profiles/openshift-ambient.yaml
#	resources/v1.22.8/profiles/openshift.yaml
#	resources/v1.22.8/profiles/preview.yaml
#	resources/v1.22.8/profiles/remote.yaml
#	resources/v1.22.8/profiles/stable.yaml
#	resources/v1.23.2/charts/cni/values.yaml
#	resources/v1.23.2/charts/istiod-remote/values.yaml
#	resources/v1.23.2/charts/istiod/values.yaml
#	resources/v1.23.2/charts/revisiontags/values.yaml
#	resources/v1.23.2/charts/ztunnel/values.yaml
#	resources/v1.23.2/profiles/ambient.yaml
#	resources/v1.23.2/profiles/default.yaml
#	resources/v1.23.2/profiles/demo.yaml
#	resources/v1.23.2/profiles/empty.yaml
#	resources/v1.23.2/profiles/openshift-ambient.yaml
#	resources/v1.23.2/profiles/openshift.yaml
#	resources/v1.23.2/profiles/preview.yaml
#	resources/v1.23.2/profiles/remote.yaml
#	resources/v1.23.2/profiles/stable.yaml
#	resources/v1.23.3/charts/cni/values.yaml
#	resources/v1.23.3/charts/istiod-remote/values.yaml
#	resources/v1.23.3/charts/istiod/values.yaml
#	resources/v1.23.3/charts/revisiontags/values.yaml
#	resources/v1.23.3/charts/ztunnel/values.yaml
#	resources/v1.23.3/profiles/ambient.yaml
#	resources/v1.23.3/profiles/default.yaml
#	resources/v1.23.3/profiles/demo.yaml
#	resources/v1.23.3/profiles/empty.yaml
#	resources/v1.23.3/profiles/openshift-ambient.yaml
#	resources/v1.23.3/profiles/openshift.yaml
#	resources/v1.23.3/profiles/preview.yaml
#	resources/v1.23.3/profiles/remote.yaml
#	resources/v1.23.3/profiles/stable.yaml
#	resources/v1.23.4/charts/cni/values.yaml
#	resources/v1.23.4/charts/istiod-remote/values.yaml
#	resources/v1.23.4/charts/istiod/values.yaml
#	resources/v1.23.4/charts/revisiontags/values.yaml
#	resources/v1.23.4/charts/ztunnel/values.yaml
#	resources/v1.23.4/profiles/ambient.yaml
#	resources/v1.23.4/profiles/default.yaml
#	resources/v1.23.4/profiles/demo.yaml
#	resources/v1.23.4/profiles/empty.yaml
#	resources/v1.23.4/profiles/openshift-ambient.yaml
#	resources/v1.23.4/profiles/openshift.yaml
#	resources/v1.23.4/profiles/preview.yaml
#	resources/v1.23.4/profiles/remote.yaml
#	resources/v1.23.4/profiles/stable.yaml
#	resources/v1.24.0/charts/cni/values.yaml
#	resources/v1.24.0/charts/istiod/values.yaml
#	resources/v1.24.0/charts/revisiontags/values.yaml
#	resources/v1.24.0/charts/ztunnel/values.yaml
#	resources/v1.24.0/profiles/ambient.yaml
#	resources/v1.24.0/profiles/default.yaml
#	resources/v1.24.0/profiles/demo.yaml
#	resources/v1.24.0/profiles/empty.yaml
#	resources/v1.24.0/profiles/openshift-ambient.yaml
#	resources/v1.24.0/profiles/openshift.yaml
#	resources/v1.24.0/profiles/preview.yaml
#	resources/v1.24.0/profiles/remote.yaml
#	resources/v1.24.0/profiles/stable.yaml
#	resources/v1.24.1/charts/cni/values.yaml
#	resources/v1.24.1/charts/istiod/values.yaml
#	resources/v1.24.1/charts/revisiontags/values.yaml
#	resources/v1.24.1/charts/ztunnel/values.yaml
#	resources/v1.24.1/profiles/ambient.yaml
#	resources/v1.24.1/profiles/default.yaml
#	resources/v1.24.1/profiles/demo.yaml
#	resources/v1.24.1/profiles/empty.yaml
#	resources/v1.24.1/profiles/openshift-ambient.yaml
#	resources/v1.24.1/profiles/openshift.yaml
#	resources/v1.24.1/profiles/preview.yaml
#	resources/v1.24.1/profiles/remote.yaml
#	resources/v1.24.1/profiles/stable.yaml
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