Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Stop using projects.registry.vmware.com for user-facing images #6073

Merged
merged 1 commit into from
Mar 7, 2024
Merged

Stop using projects.registry.vmware.com for user-facing images #6073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions ci/kind/test-upgrade-antrea.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,10 +152,10 @@ function version_lt() { test "$(printf '%s\n' "$@" | sort -rV | head -n 1)" != "

DOCKER_IMAGES=()
if version_lt "$FROM_TAG" v1.15; then
DOCKER_IMAGES+=("projects.registry.vmware.com/antrea/antrea-ubuntu:$FROM_TAG")
DOCKER_IMAGES+=("antrea/antrea-ubuntu:$FROM_TAG")
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we keep this as before considering it's only for testing? I am thinking the test may fail more frequently due to Docker rate limit.

Copy link
Contributor

Choose a reason for hiding this comment

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

Another question is should we release a new patch release after the backport? cc @tnqn

Copy link
Member

Choose a reason for hiding this comment

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

We don't have rate-limit as explained in the PR description.
Yes, we should release new patch releases, there has been some bugfixes accumulated.

Copy link
Contributor

Choose a reason for hiding this comment

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

I am not getting that why we change the images from Dockerhub to Harbor registry at the first place? I recalled it was because of rate limits? Or Antrea wasn't a part of the "Sponsored OSS" programs when the registry is changed?

Copy link
Member

Choose a reason for hiding this comment

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

Right

else
DOCKER_IMAGES+=("projects.registry.vmware.com/antrea/antrea-agent-ubuntu:$FROM_TAG" \
"projects.registry.vmware.com/antrea/antrea-controller-ubuntu:$FROM_TAG")
DOCKER_IMAGES+=("antrea/antrea-agent-ubuntu:$FROM_TAG" \
"antrea/antrea-controller-ubuntu:$FROM_TAG")
fi

# Silence CLI suggestions.
Expand Down Expand Up @@ -189,9 +189,9 @@ $ROOT_DIR/hack/generate-manifest.sh --on-delete | docker exec -i kind-control-pl
TMP_ANTREA_DIR=$(mktemp -d)
git clone --branch $FROM_TAG --depth 1 https://github.com/antrea-io/antrea.git $TMP_ANTREA_DIR
pushd $TMP_ANTREA_DIR > /dev/null
export IMG_NAME=projects.registry.vmware.com/antrea/antrea-ubuntu
export AGENT_IMG_NAME=projects.registry.vmware.com/antrea/antrea-agent-ubuntu
export CONTROLLER_IMG_NAME=projects.registry.vmware.com/antrea/antrea-controller-ubuntu
export IMG_NAME=antrea/antrea-ubuntu
export AGENT_IMG_NAME=antrea/antrea-agent-ubuntu
export CONTROLLER_IMG_NAME=antrea/antrea-controller-ubuntu
export IMG_TAG=$FROM_TAG
./hack/generate-manifest.sh --mode release | kubectl apply -f -
./hack/generate-manifest.sh --mode release | docker exec -i kind-control-plane dd of=/root/antrea.yml
Expand Down
6 changes: 3 additions & 3 deletions docs/kind.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ pull from the registry), you can use:
```bash
tag=<TAG>
cluster=<CLUSTER_NAME>
docker pull projects.registry.vmware.com/antrea/antrea-controller-ubuntu:$tag
docker pull projects.registry.vmware.com/antrea/antrea-agent-ubuntu:$tag
docker pull antrea/antrea-controller-ubuntu:$tag
docker pull antrea/antrea-agent-ubuntu:$tag
./ci/kind/kind-setup.sh \
--images "projects.registry.vmware.com/antrea/antrea-controller-ubuntu:$tag projects.registry.vmware.com/antrea/antrea-agent-ubuntu:$tag" \
--images "antrea/antrea-controller-ubuntu:$tag antrea/antrea-agent-ubuntu:$tag" \
create $cluster
kubectl apply -f https://github.com/antrea-io/antrea/releases/download/$tag/antrea.yml
```
Expand Down
5 changes: 0 additions & 5 deletions hack/generate-helm-release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,18 +94,13 @@ ANTREA_CHART="$THIS_DIR/../build/charts/antrea"
# ignored as per the .helmignore file.
cp "$ANTREA_CHART/Chart.yaml" "$ANTREA_CHART/Chart.yaml.bak"
yq -i '.annotations."artifacthub.io/prerelease" = strenv(PRERELEASE)' "$ANTREA_CHART/Chart.yaml"
sed -i.bak 's=antrea/antrea-agent-ubuntu=projects.registry.vmware.com/antrea/antrea-agent-ubuntu=g' "$ANTREA_CHART/values.yaml"
sed -i.bak 's=antrea/antrea-controller-ubuntu=projects.registry.vmware.com/antrea/antrea-controller-ubuntu=g' "$ANTREA_CHART/values.yaml"
$HELM package --app-version $VERSION --version $VERSION $ANTREA_CHART
mv "antrea-$VERSION.tgz" "$OUT/antrea-chart.tgz"
mv "$ANTREA_CHART/Chart.yaml.bak" "$ANTREA_CHART/Chart.yaml"
mv "$ANTREA_CHART/values.yaml.bak" "$ANTREA_CHART/values.yaml"

FLOW_AGGREGATOR_CHART="$THIS_DIR/../build/charts/flow-aggregator"
cp "$FLOW_AGGREGATOR_CHART/Chart.yaml" "$FLOW_AGGREGATOR_CHART/Chart.yaml.bak"
yq -i '.annotations."artifacthub.io/prerelease" = strenv(PRERELEASE)' "$FLOW_AGGREGATOR_CHART/Chart.yaml"
sed -i.bak 's=antrea/flow-aggregator=projects.registry.vmware.com/antrea/flow-aggregator=g' "$FLOW_AGGREGATOR_CHART/values.yaml"
$HELM package --app-version $VERSION --version $VERSION $FLOW_AGGREGATOR_CHART
mv "flow-aggregator-$VERSION.tgz" "$OUT/flow-aggregator-chart.tgz"
mv "$FLOW_AGGREGATOR_CHART/Chart.yaml.bak" "$FLOW_AGGREGATOR_CHART/Chart.yaml"
mv "$FLOW_AGGREGATOR_CHART/values.yaml.bak" "$FLOW_AGGREGATOR_CHART/values.yaml"
10 changes: 5 additions & 5 deletions hack/release/prepare-assets.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,20 +105,20 @@ cp ./hack/externalnode/install-vm.ps1 "$OUTPUT_DIR/"

export IMG_TAG=$VERSION

export AGENT_IMG_NAME=projects.registry.vmware.com/antrea/antrea-agent-ubuntu
export CONTROLLER_IMG_NAME=projects.registry.vmware.com/antrea/antrea-controller-ubuntu
export AGENT_IMG_NAME=antrea/antrea-agent-ubuntu
export CONTROLLER_IMG_NAME=antrea/antrea-controller-ubuntu
./hack/generate-standard-manifests.sh --mode release --out "$OUTPUT_DIR"

export IMG_NAME=projects.registry.vmware.com/antrea/antrea-windows
export IMG_NAME=antrea/antrea-windows
./hack/generate-manifest-windows.sh --mode release > "$OUTPUT_DIR"/antrea-windows.yml
./hack/generate-manifest-windows.sh --mode release --containerd > "$OUTPUT_DIR"/antrea-windows-containerd.yml
./hack/generate-manifest-windows.sh --mode release --containerd --include-ovs > "$OUTPUT_DIR"/antrea-windows-containerd-with-ovs.yml

export IMG_NAME=projects.registry.vmware.com/antrea/flow-aggregator
export IMG_NAME=antrea/flow-aggregator
./hack/generate-manifest-flow-aggregator.sh --mode release > "$OUTPUT_DIR"/flow-aggregator.yml

# Generate multicluster manifests
export IMG_NAME=projects.registry.vmware.com/antrea/antrea-mc-controller
export IMG_NAME=antrea/antrea-mc-controller
cd multicluster
./hack/generate-manifest.sh -g > "$OUTPUT_DIR"/antrea-multicluster-leader-global.yml
./hack/generate-manifest.sh -r -n antrea-multicluster > "$OUTPUT_DIR"/antrea-multicluster-leader-namespaced.yml
Expand Down
Loading