diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 909219f7753..2262543aa9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -175,7 +175,7 @@ jobs: - name: Build flow-aggregator Docker image run: make flow-aggregator-image - name: Check flow-aggregator Docker image - run: docker run projects.registry.vmware.com/antrea/flow-aggregator --version + run: docker run antrea/flow-aggregator --version - name: Push flow-aggregator Docker image to registry if: ${{ github.repository == 'antrea-io/antrea' && github.event_name == 'push' && github.ref == 'refs/heads/main' }} env: diff --git a/.github/workflows/kind.yml b/.github/workflows/kind.yml index 1f05d8f76e4..49a809bd76a 100644 --- a/.github/workflows/kind.yml +++ b/.github/workflows/kind.yml @@ -443,7 +443,6 @@ jobs: run: | docker load -i antrea-ubuntu.tar docker tag antrea/antrea-ubuntu-coverage:latest antrea/antrea-ubuntu:latest - docker tag antrea/antrea-ubuntu-coverage:latest projects.registry.vmware.com/antrea/antrea-ubuntu:latest - name: Install Kind run: | curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64 @@ -486,7 +485,6 @@ jobs: run: | docker load -i antrea-ubuntu.tar docker tag antrea/antrea-ubuntu-coverage:latest antrea/antrea-ubuntu:latest - docker tag antrea/antrea-ubuntu-coverage:latest projects.registry.vmware.com/antrea/antrea-ubuntu:latest - name: Install Kind run: | curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64 @@ -529,7 +527,6 @@ jobs: run: | docker load -i antrea-ubuntu.tar docker tag antrea/antrea-ubuntu-coverage:latest antrea/antrea-ubuntu:latest - docker tag antrea/antrea-ubuntu-coverage:latest projects.registry.vmware.com/antrea/antrea-ubuntu:latest - name: Install Kind run: | curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64 @@ -572,7 +569,6 @@ jobs: run: | docker load -i antrea-ubuntu.tar docker tag antrea/antrea-ubuntu-coverage:latest antrea/antrea-ubuntu:latest - docker tag antrea/antrea-ubuntu-coverage:latest projects.registry.vmware.com/antrea/antrea-ubuntu:latest - name: Install Kind run: | curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64 @@ -615,7 +611,6 @@ jobs: run: | docker load -i antrea-ubuntu.tar docker tag antrea/antrea-ubuntu-coverage:latest antrea/antrea-ubuntu:latest - docker tag antrea/antrea-ubuntu-coverage:latest projects.registry.vmware.com/antrea/antrea-ubuntu:latest - name: Install Kind run: | curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64 @@ -650,7 +645,6 @@ jobs: run: | docker load -i antrea-ubuntu.tar docker tag antrea/antrea-ubuntu-coverage:latest antrea/antrea-ubuntu:latest - docker tag antrea/antrea-ubuntu-coverage:latest projects.registry.vmware.com/antrea/antrea-ubuntu:latest - name: Install Kind run: | curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64 diff --git a/Makefile b/Makefile index bc0667e9a00..62bfb1a4842 100644 --- a/Makefile +++ b/Makefile @@ -313,8 +313,6 @@ else docker build --pull -t antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.ubuntu $(DOCKER_BUILD_ARGS) . endif docker tag antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) antrea/antrea-ubuntu - docker tag antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-ubuntu - docker tag antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) # Build bins in a golang container, and build the antrea-ubuntu Docker image. .PHONY: build-ubuntu @@ -326,8 +324,6 @@ else docker build --pull -t antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.build.ubuntu $(DOCKER_BUILD_ARGS) . endif docker tag antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) antrea/antrea-ubuntu - docker tag antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-ubuntu - docker tag antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-ubuntu:$(DOCKER_IMG_VERSION) # Build bins in a golang container, and build the antrea-ubi Docker image. .PHONY: build-ubi @@ -339,8 +335,6 @@ else docker build --pull -t antrea/antrea-ubi:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.build.ubi $(DOCKER_BUILD_ARGS) . endif docker tag antrea/antrea-ubi:$(DOCKER_IMG_VERSION) antrea/antrea-ubi - docker tag antrea/antrea-ubi:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-ubi - docker tag antrea/antrea-ubi:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-ubi:$(DOCKER_IMG_VERSION) .PHONY: build-windows build-windows: @@ -352,8 +346,6 @@ else docker build --pull -t antrea/antrea-windows:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.build.windows $(WIN_BUILD_ARGS) . endif docker tag antrea/antrea-windows:$(DOCKER_IMG_VERSION) antrea/antrea-windows - docker tag antrea/antrea-windows:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-windows - docker tag antrea/antrea-windows:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-windows:$(DOCKER_IMG_VERSION) .PHONY: build-ubuntu-coverage build-ubuntu-coverage: @@ -395,8 +387,6 @@ octant-antrea-ubuntu: @echo "===> Building antrea/octant-antrea-ubuntu Docker image <===" docker build --pull -t antrea/octant-antrea-ubuntu:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.octant.ubuntu $(DOCKER_BUILD_ARGS) . docker tag antrea/octant-antrea-ubuntu:$(DOCKER_IMG_VERSION) antrea/octant-antrea-ubuntu - docker tag antrea/octant-antrea-ubuntu:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/octant-antrea-ubuntu - docker tag antrea/octant-antrea-ubuntu:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/octant-antrea-ubuntu:$(DOCKER_IMG_VERSION) .PHONY: antrea-mc-controller antrea-mc-controller: @@ -407,8 +397,6 @@ else docker build --pull -t antrea/antrea-mc-controller:$(DOCKER_IMG_VERSION) -f multicluster/build/images/Dockerfile.build $(DOCKER_BUILD_ARGS) . endif docker tag antrea/antrea-mc-controller:$(DOCKER_IMG_VERSION) antrea/antrea-mc-controller - docker tag antrea/antrea-mc-controller:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-mc-controller - docker tag antrea/antrea-mc-controller:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-mc-controller:$(DOCKER_IMG_VERSION) .PHONY: antrea-mc-controller-coverage antrea-mc-controller-coverage: @@ -419,7 +407,6 @@ else docker build --pull -t antrea/antrea-mc-controller-coverage:$(DOCKER_IMG_VERSION) -f multicluster/build/images/Dockerfile.build.coverage $(DOCKER_BUILD_ARGS) . endif docker tag antrea/antrea-mc-controller-coverage:$(DOCKER_IMG_VERSION) antrea/antrea-mc-controller-coverage - docker tag antrea/antrea-mc-controller-coverage:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/antrea-mc-controller-coverage .PHONY: flow-aggregator-image flow-aggregator-image: @@ -430,8 +417,6 @@ else docker build --pull -t antrea/flow-aggregator:$(DOCKER_IMG_VERSION) -f build/images/flow-aggregator/Dockerfile $(DOCKER_BUILD_ARGS) . endif docker tag antrea/flow-aggregator:$(DOCKER_IMG_VERSION) antrea/flow-aggregator - docker tag antrea/flow-aggregator:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/flow-aggregator - docker tag antrea/flow-aggregator:$(DOCKER_IMG_VERSION) projects.registry.vmware.com/antrea/flow-aggregator:$(DOCKER_IMG_VERSION) .PHONY: flow-aggregator-ubuntu-coverage flow-aggregator-ubuntu-coverage: diff --git a/build/charts/antrea/README.md b/build/charts/antrea/README.md index ef6927196a8..49b8e60e6aa 100644 --- a/build/charts/antrea/README.md +++ b/build/charts/antrea/README.md @@ -74,7 +74,7 @@ Kubernetes: `>= 1.16.0-0` | flowCollector.flowPollInterval | string | `"5s"` | Determines how often the flow exporter polls for new connections. | | flowCollector.idleFlowExportTimeout | string | `"15s"` | timeout after which a flow record is sent to the collector for idle flows. | | hostGateway | string | `"antrea-gw0"` | Name of the interface antrea-agent will create and use for host <-> Pod communication. | -| image | object | `{"pullPolicy":"IfNotPresent","repository":"projects.registry.vmware.com/antrea/antrea-ubuntu","tag":""}` | Container image to use for Antrea components. | +| image | object | `{"pullPolicy":"IfNotPresent","repository":"antrea/antrea-ubuntu","tag":""}` | Container image to use for Antrea components. | | ipsec.authenticationMode | string | `"psk"` | The authentication mode to use for IPsec. Must be one of "psk" or "cert". | | ipsec.csrSigner | object | `{"autoApprove":true,"selfSignedCA":true}` | CSR signer configuration when the authenticationMode is "cert". | | ipsec.csrSigner.autoApprove | bool | `true` | - Enable auto approval of Antrea signer for IPsec certificates. | diff --git a/build/charts/antrea/templates/simulator/statefulset.yaml b/build/charts/antrea/templates/simulator/statefulset.yaml index 3b88accb1bb..efb418396d6 100644 --- a/build/charts/antrea/templates/simulator/statefulset.yaml +++ b/build/charts/antrea/templates/simulator/statefulset.yaml @@ -45,7 +45,7 @@ spec: path: /var/log containers: - name: simulator - image: projects.registry.vmware.com/antrea/antrea-ubuntu-simulator:latest + image: antrea/antrea-ubuntu-simulator:latest imagePullPolicy: IfNotPresent command: ['/usr/local/bin/antrea-agent-simulator', '-v', '5'] env: diff --git a/build/charts/antrea/values.yaml b/build/charts/antrea/values.yaml index e22431495ba..127ed880bf8 100644 --- a/build/charts/antrea/values.yaml +++ b/build/charts/antrea/values.yaml @@ -1,6 +1,6 @@ # -- Container image to use for Antrea components. image: - repository: "projects.registry.vmware.com/antrea/antrea-ubuntu" + repository: "antrea/antrea-ubuntu" pullPolicy: "IfNotPresent" tag: "" diff --git a/build/charts/flow-aggregator/README.md b/build/charts/flow-aggregator/README.md index f88dd13fcb3..4721b6f02d5 100644 --- a/build/charts/flow-aggregator/README.md +++ b/build/charts/flow-aggregator/README.md @@ -34,7 +34,7 @@ Kubernetes: `>= 1.16.0-0` | flowCollector.enable | bool | `false` | Determine whether to enable exporting flow records to external flow collector. | | flowCollector.observationDomainID | string | `""` | Provide the 32-bit Observation Domain ID which will uniquely identify this instance of the flow aggregator to an external flow collector. If omitted, an Observation Domain ID will be generated from the persistent cluster UUID generated by Antrea. | | flowCollector.recordFormat | string | `"IPFIX"` | Provide format for records sent to the configured flow collector. Supported formats are IPFIX and JSON. | -| image | object | `{"pullPolicy":"IfNotPresent","repository":"projects.registry.vmware.com/antrea/flow-aggregator","tag":""}` | Container image used by Flow Aggregator. | +| image | object | `{"pullPolicy":"IfNotPresent","repository":"antrea/flow-aggregator","tag":""}` | Container image used by Flow Aggregator. | | inactiveFlowRecordTimeout | string | `"90s"` | Provide the inactive flow record timeout as a duration string. Valid time units are "ns", "us" (or "µs"), "ms", "s", "m", "h". | | logVerbosity | int | `0` | | | recordContents.podLabels | bool | `false` | Determine whether source and destination Pod labels will be included in the flow records. | diff --git a/build/charts/flow-aggregator/values.yaml b/build/charts/flow-aggregator/values.yaml index 5caa3fbea5e..6b7cb5be258 100644 --- a/build/charts/flow-aggregator/values.yaml +++ b/build/charts/flow-aggregator/values.yaml @@ -1,6 +1,6 @@ # -- Container image used by Flow Aggregator. image: - repository: "projects.registry.vmware.com/antrea/flow-aggregator" + repository: "antrea/flow-aggregator" pullPolicy: "IfNotPresent" tag: "" diff --git a/build/yamls/antrea-aks.yml b/build/yamls/antrea-aks.yml index 3f03f3bb0d3..8e6d9def04f 100644 --- a/build/yamls/antrea-aks.yml +++ b/build/yamls/antrea-aks.yml @@ -4161,7 +4161,7 @@ spec: initContainers: containers: - name: install-cni - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4195,7 +4195,7 @@ spec: - name: host-var-run-antrea mountPath: /var/run/antrea - name: antrea-agent - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent command: ["antrea-agent"] # Log to both "/var/log/antrea/" and stderr (so "kubectl logs" can work).- @@ -4287,7 +4287,7 @@ spec: - name: xtables-lock mountPath: /run/xtables.lock - name: antrea-ovs - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4400,7 +4400,7 @@ spec: serviceAccountName: antrea-controller containers: - name: antrea-controller - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: diff --git a/build/yamls/antrea-eks.yml b/build/yamls/antrea-eks.yml index 3b448a36431..57b18ce5c44 100644 --- a/build/yamls/antrea-eks.yml +++ b/build/yamls/antrea-eks.yml @@ -4161,7 +4161,7 @@ spec: initContainers: containers: - name: install-cni - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4195,7 +4195,7 @@ spec: - name: host-var-run-antrea mountPath: /var/run/antrea - name: antrea-agent - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent command: ["antrea-agent"] # Log to both "/var/log/antrea/" and stderr (so "kubectl logs" can work).- @@ -4289,7 +4289,7 @@ spec: - name: xtables-lock mountPath: /run/xtables.lock - name: antrea-ovs - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4402,7 +4402,7 @@ spec: serviceAccountName: antrea-controller containers: - name: antrea-controller - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: diff --git a/build/yamls/antrea-gke.yml b/build/yamls/antrea-gke.yml index 1cd34810d8a..b6e5a4b4254 100644 --- a/build/yamls/antrea-gke.yml +++ b/build/yamls/antrea-gke.yml @@ -4160,7 +4160,7 @@ spec: serviceAccountName: antrea-agent initContainers: - name: install-cni - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4194,7 +4194,7 @@ spec: mountPath: /var/run/antrea containers: - name: antrea-agent - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent command: ["antrea-agent"] # Log to both "/var/log/antrea/" and stderr (so "kubectl logs" can work).- @@ -4286,7 +4286,7 @@ spec: - name: xtables-lock mountPath: /run/xtables.lock - name: antrea-ovs - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4399,7 +4399,7 @@ spec: serviceAccountName: antrea-controller containers: - name: antrea-controller - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: diff --git a/build/yamls/antrea-ipsec.yml b/build/yamls/antrea-ipsec.yml index ba5391715d0..8566bc6085e 100644 --- a/build/yamls/antrea-ipsec.yml +++ b/build/yamls/antrea-ipsec.yml @@ -4174,7 +4174,7 @@ spec: serviceAccountName: antrea-agent initContainers: - name: install-cni - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4208,7 +4208,7 @@ spec: mountPath: /var/run/antrea containers: - name: antrea-agent - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent command: ["antrea-agent"] # Log to both "/var/log/antrea/" and stderr (so "kubectl logs" can work).- @@ -4309,7 +4309,7 @@ spec: - name: xtables-lock mountPath: /run/xtables.lock - name: antrea-ovs - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4346,7 +4346,7 @@ spec: mountPath: /var/log/openvswitch subPath: openvswitch - name: antrea-ipsec - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4458,7 +4458,7 @@ spec: serviceAccountName: antrea-controller containers: - name: antrea-controller - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: diff --git a/build/yamls/antrea-octant.yml b/build/yamls/antrea-octant.yml index 7e661d98b70..8c370201402 100644 --- a/build/yamls/antrea-octant.yml +++ b/build/yamls/antrea-octant.yml @@ -50,7 +50,7 @@ spec: value: "true" - name: KUBECONFIG value: /kube/admin.conf - image: projects.registry.vmware.com/antrea/octant-antrea-ubuntu:latest + image: antrea/octant-antrea-ubuntu:latest imagePullPolicy: IfNotPresent name: antrea-octant ports: diff --git a/build/yamls/antrea-windows.yml b/build/yamls/antrea-windows.yml index 21984166d52..5dc6cbb8b02 100644 --- a/build/yamls/antrea-windows.yml +++ b/build/yamls/antrea-windows.yml @@ -209,7 +209,7 @@ spec: valueFrom: fieldRef: fieldPath: spec.nodeName - image: projects.registry.vmware.com/antrea/antrea-windows:latest + image: antrea/antrea-windows:latest imagePullPolicy: IfNotPresent name: antrea-agent volumeMounts: @@ -230,7 +230,7 @@ spec: - /k/antrea/Install-WindowsCNI.ps1 command: - pwsh - image: projects.registry.vmware.com/antrea/antrea-windows:latest + image: antrea/antrea-windows:latest imagePullPolicy: IfNotPresent name: install-cni volumeMounts: diff --git a/build/yamls/antrea.yml b/build/yamls/antrea.yml index 7670874fae0..86e45a883c1 100644 --- a/build/yamls/antrea.yml +++ b/build/yamls/antrea.yml @@ -4160,7 +4160,7 @@ spec: serviceAccountName: antrea-agent initContainers: - name: install-cni - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4194,7 +4194,7 @@ spec: mountPath: /var/run/antrea containers: - name: antrea-agent - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent command: ["antrea-agent"] # Log to both "/var/log/antrea/" and stderr (so "kubectl logs" can work).- @@ -4286,7 +4286,7 @@ spec: - name: xtables-lock mountPath: /run/xtables.lock - name: antrea-ovs - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: @@ -4399,7 +4399,7 @@ spec: serviceAccountName: antrea-controller containers: - name: antrea-controller - image: "projects.registry.vmware.com/antrea/antrea-ubuntu:latest" + image: "antrea/antrea-ubuntu:latest" imagePullPolicy: IfNotPresent resources: requests: diff --git a/build/yamls/flow-aggregator.yml b/build/yamls/flow-aggregator.yml index 6b5909687ab..12d84903191 100644 --- a/build/yamls/flow-aggregator.yml +++ b/build/yamls/flow-aggregator.yml @@ -389,7 +389,7 @@ spec: secretKeyRef: key: aws_session_token name: flow-aggregator-aws-credentials - image: projects.registry.vmware.com/antrea/flow-aggregator:latest + image: antrea/flow-aggregator:latest imagePullPolicy: IfNotPresent name: flow-aggregator ports: diff --git a/ci/jenkins/test-mc.sh b/ci/jenkins/test-mc.sh index 8a876c85486..a8bd6ffd810 100755 --- a/ci/jenkins/test-mc.sh +++ b/ci/jenkins/test-mc.sh @@ -265,12 +265,12 @@ function deliver_antrea_multicluster { DOCKER_REGISTRY="${DOCKER_REGISTRY}" ./hack/build-antrea-linux-all.sh --pull echo "====== Delivering Antrea to all the Nodes ======" - docker save -o ${WORKDIR}/antrea-ubuntu.tar ${DOCKER_REGISTRY}/antrea/antrea-ubuntu:latest + docker save -o ${WORKDIR}/antrea-ubuntu.tar antrea/antrea-ubuntu:latest if [[ ${KIND} == "true" ]]; then for name in ${CLUSTER_NAMES[*]}; do - kind load docker-image ${DOCKER_REGISTRY}/antrea/antrea-ubuntu:latest --name ${name} + kind load docker-image antrea/antrea-ubuntu:latest --name ${name} done else for kubeconfig in "${multicluster_kubeconfigs[@]}" @@ -294,10 +294,10 @@ function deliver_multicluster_controller { export GOROOT=/usr/local/go export PATH=${GOROOT}/bin:$PATH - DEFAULT_IMAGE="${DOCKER_REGISTRY}"/antrea/antrea-mc-controller:latest + DEFAULT_IMAGE=antrea/antrea-mc-controller:latest if $COVERAGE;then export NO_PULL=1;make antrea-mc-controller-coverage - DEFAULT_IMAGE="${DOCKER_REGISTRY}"/antrea/antrea-mc-controller-coverage:latest + DEFAULT_IMAGE=antrea/antrea-mc-controller-coverage:latest docker save "${DEFAULT_IMAGE}" -o "${WORKDIR}"/antrea-mcs.tar ./multicluster/hack/generate-manifest.sh -l antrea-multicluster -c > ./multicluster/test/yamls/leader-manifest.yml ./multicluster/hack/generate-manifest.sh -m -c > ./multicluster/test/yamls/member-manifest.yml diff --git a/ci/jenkins/test-vmc.sh b/ci/jenkins/test-vmc.sh index aeecab70198..ef4215dd7b8 100755 --- a/ci/jenkins/test-vmc.sh +++ b/ci/jenkins/test-vmc.sh @@ -420,8 +420,8 @@ function deliver_antrea { docker save -o antrea-ubuntu-coverage.tar antrea/antrea-ubuntu-coverage:${DOCKER_IMG_VERSION} docker save -o flow-aggregator-coverage.tar antrea/flow-aggregator-coverage:${DOCKER_IMG_VERSION} else - docker save -o antrea-ubuntu.tar projects.registry.vmware.com/antrea/antrea-ubuntu:${DOCKER_IMG_VERSION} - docker save -o flow-aggregator.tar projects.registry.vmware.com/antrea/flow-aggregator:${DOCKER_IMG_VERSION} + docker save -o antrea-ubuntu.tar antrea/antrea-ubuntu:${DOCKER_IMG_VERSION} + docker save -o flow-aggregator.tar antrea/flow-aggregator:${DOCKER_IMG_VERSION} fi control_plane_ip="$(kubectl get nodes -o wide --no-headers=true | awk -v role="$CONTROL_PLANE_NODE_ROLE" '$3 ~ role {print $6}')" @@ -435,8 +435,8 @@ function deliver_antrea { copy_image antrea-ubuntu-coverage.tar docker.io/antrea/antrea-ubuntu-coverage ${IPs[$i]} ${DOCKER_IMG_VERSION} true copy_image flow-aggregator-coverage.tar docker.io/antrea/flow-aggregator-coverage ${IPs[$i]} ${DOCKER_IMG_VERSION} true else - copy_image antrea-ubuntu.tar projects.registry.vmware.com/antrea/antrea-ubuntu ${IPs[$i]} ${DOCKER_IMG_VERSION} true - copy_image flow-aggregator.tar projects.registry.vmware.com/antrea/flow-aggregator ${IPs[$i]} ${DOCKER_IMG_VERSION} true + copy_image antrea-ubuntu.tar docker.io/antrea/antrea-ubuntu ${IPs[$i]} ${DOCKER_IMG_VERSION} true + copy_image flow-aggregator.tar docker.io/antrea/flow-aggregator ${IPs[$i]} ${DOCKER_IMG_VERSION} true fi done @@ -449,11 +449,10 @@ function deliver_antrea { docker pull ${DOCKER_REGISTRY}/antrea/antrea-ubuntu:$OLD_ANTREA_VERSION else docker pull antrea/antrea-ubuntu:$OLD_ANTREA_VERSION - docker tag antrea/antrea-ubuntu:$OLD_ANTREA_VERSION projects.registry.vmware.com/antrea/antrea-ubuntu:$OLD_ANTREA_VERSION fi echo "====== Delivering old Antrea images to all the Nodes ======" - docker save -o antrea-ubuntu-old.tar projects.registry.vmware.com/antrea/antrea-ubuntu:$OLD_ANTREA_VERSION + docker save -o antrea-ubuntu-old.tar antrea/antrea-ubuntu:$OLD_ANTREA_VERSION node_num=$(kubectl get nodes --no-headers=true | wc -l) antrea_image="antrea-ubuntu" for i in "${!IPs[@]}" @@ -461,7 +460,7 @@ function deliver_antrea { # We want old-versioned Antrea agents to be more than half in cluster if [[ $i -ge $((${node_num}/2)) ]]; then # Tag old image to latest if we want Antrea agent to be old-versioned - copy_image antrea-ubuntu-old.tar projects.registry.vmware.com/antrea/antrea-ubuntu ${IPs[$i]} $OLD_ANTREA_VERSION false + copy_image antrea-ubuntu-old.tar docker.io/antrea/antrea-ubuntu ${IPs[$i]} $OLD_ANTREA_VERSION false fi done } diff --git a/ci/jenkins/test.sh b/ci/jenkins/test.sh index 99b0dad59e4..c6593299af6 100755 --- a/ci/jenkins/test.sh +++ b/ci/jenkins/test.sh @@ -316,7 +316,7 @@ function deliver_antrea_windows { fi cp -f build/yamls/*.yml $WORKDIR - docker save -o antrea-ubuntu.tar projects.registry.vmware.com/antrea/antrea-ubuntu:latest + docker save -o antrea-ubuntu.tar antrea/antrea-ubuntu:latest echo "===== Pull necessary images on Control-Plane node =====" harbor_images=("agnhost:2.13" "nginx:1.15-alpine") @@ -491,8 +491,8 @@ function deliver_antrea { cp -f build/yamls/*.yml $WORKDIR echo "====== Delivering Antrea to all the Nodes ======" - docker save -o antrea-ubuntu.tar projects.registry.vmware.com/antrea/antrea-ubuntu:latest - docker save -o flow-aggregator.tar projects.registry.vmware.com/antrea/flow-aggregator:latest + docker save -o antrea-ubuntu.tar antrea/antrea-ubuntu:latest + docker save -o flow-aggregator.tar antrea/flow-aggregator:latest if [[ $TESTBED_TYPE == "flexible-ipam" ]]; then kubectl get nodes -o wide --no-headers=true | awk '{print $6}' | while read IP; do diff --git a/ci/kind/kind-setup.sh b/ci/kind/kind-setup.sh index 17c32e2cd60..ad975f6243a 100755 --- a/ci/kind/kind-setup.sh +++ b/ci/kind/kind-setup.sh @@ -19,7 +19,7 @@ # and docker bridge network connecting to worker Node. CLUSTER_NAME="" -ANTREA_IMAGE="projects.registry.vmware.com/antrea/antrea-ubuntu:latest" +ANTREA_IMAGE="antrea/antrea-ubuntu:latest" IMAGES=$ANTREA_IMAGE ANTREA_CNI=false POD_CIDR="" diff --git a/ci/kind/test-e2e-kind.sh b/ci/kind/test-e2e-kind.sh index 15fef5d0788..1ada717ba41 100755 --- a/ci/kind/test-e2e-kind.sh +++ b/ci/kind/test-e2e-kind.sh @@ -160,7 +160,7 @@ if $coverage; then manifest_args="$manifest_args --coverage" COMMON_IMAGES_LIST+=("antrea/antrea-ubuntu-coverage:latest") else - COMMON_IMAGES_LIST+=("projects.registry.vmware.com/antrea/antrea-ubuntu:latest") + COMMON_IMAGES_LIST+=("antrea/antrea-ubuntu:latest") fi if $proxy_all; then COMMON_IMAGES_LIST+=("k8s.gcr.io/echoserver:1.10") @@ -170,7 +170,7 @@ if $flow_visibility; then if $coverage; then COMMON_IMAGES_LIST+=("antrea/flow-aggregator-coverage:latest") else - COMMON_IMAGES_LIST+=("projects.registry.vmware.com/antrea/flow-aggregator:latest") + COMMON_IMAGES_LIST+=("antrea/flow-aggregator:latest") fi fi for image in "${COMMON_IMAGES_LIST[@]}"; do diff --git a/ci/kind/test-upgrade-antrea.sh b/ci/kind/test-upgrade-antrea.sh index 205af15e962..845c7e8183d 100755 --- a/ci/kind/test-upgrade-antrea.sh +++ b/ci/kind/test-upgrade-antrea.sh @@ -158,7 +158,7 @@ for img in "${DOCKER_IMAGES[@]}"; do done done -DOCKER_IMAGES+=("projects.registry.vmware.com/antrea/antrea-ubuntu:latest") +DOCKER_IMAGES+=("antrea/antrea-ubuntu:latest") echo "Creating Kind cluster" IMAGES="${DOCKER_IMAGES[@]}" diff --git a/ci/test-conformance-aks.sh b/ci/test-conformance-aks.sh index cabb082bd0a..fbc11cc1903 100755 --- a/ci/test-conformance-aks.sh +++ b/ci/test-conformance-aks.sh @@ -201,7 +201,7 @@ function deliver_antrea_to_aks() { antrea_image="antrea-ubuntu" DOCKER_IMG_VERSION=${CLUSTER} - DOCKER_IMG_NAME="projects.registry.vmware.com/antrea/antrea-ubuntu" + DOCKER_IMG_NAME="antrea/antrea-ubuntu" docker save -o ${antrea_image}.tar ${DOCKER_IMG_NAME}:${DOCKER_IMG_VERSION} CLUSTER_RESOURCE_GROUP=$(az aks show --resource-group ${RESOURCE_GROUP} --name ${CLUSTER} --query nodeResourceGroup -o tsv) diff --git a/ci/test-conformance-eks.sh b/ci/test-conformance-eks.sh index a9e34385f73..eda5eeb7568 100755 --- a/ci/test-conformance-eks.sh +++ b/ci/test-conformance-eks.sh @@ -239,7 +239,7 @@ function deliver_antrea_to_eks() { echo "=== Loading the Antrea image to each Node ===" antrea_image="antrea-ubuntu" DOCKER_IMG_VERSION=${CLUSTER} - DOCKER_IMG_NAME="projects.registry.vmware.com/antrea/antrea-ubuntu" + DOCKER_IMG_NAME="antrea/antrea-ubuntu" docker save -o ${antrea_image}.tar ${DOCKER_IMG_NAME}:${DOCKER_IMG_VERSION} kubectl get nodes -o wide --no-headers=true | awk '{print $7}' | while read IP; do diff --git a/ci/test-conformance-gke.sh b/ci/test-conformance-gke.sh index 4a968e4303b..04c01062758 100755 --- a/ci/test-conformance-gke.sh +++ b/ci/test-conformance-gke.sh @@ -212,7 +212,7 @@ function deliver_antrea_to_gke() { echo "=== Loading the Antrea image to each Node ===" antrea_image="antrea-ubuntu" DOCKER_IMG_VERSION=${CLUSTER} - DOCKER_IMG_NAME="projects.registry.vmware.com/antrea/antrea-ubuntu" + DOCKER_IMG_NAME="antrea/antrea-ubuntu" docker save -o ${antrea_image}.tar ${DOCKER_IMG_NAME}:${DOCKER_IMG_VERSION} node_names=$(kubectl get nodes -o wide --no-headers=true | awk '{print $1}') diff --git a/docs/kind.md b/docs/kind.md index f2015ebf78b..03ca92bdeb3 100644 --- a/docs/kind.md +++ b/docs/kind.md @@ -132,7 +132,7 @@ These instructions assume that you have built the Antrea Docker image locally ```bash # load the Antrea Docker image in the Nodes -kind load docker-image projects.registry.vmware.com/antrea/antrea-ubuntu:latest +kind load docker-image antrea/antrea-ubuntu:latest # deploy Antrea kubectl apply -f build/yamls/antrea.yml ``` diff --git a/docs/minikube.md b/docs/minikube.md index fc6e071b5b8..ebd9f4424e1 100644 --- a/docs/minikube.md +++ b/docs/minikube.md @@ -30,7 +30,7 @@ These instructions assume that you have built the Antrea Docker image locally ```bash # load the Antrea Docker image in the minikube nodes -minikube image load projects.registry.vmware.com/antrea/antrea-ubuntu:latest +minikube image load antrea/antrea-ubuntu:latest # deploy Antrea kubectl apply -f antrea/build/yamls/antrea.yml ``` diff --git a/hack/generate-helm-release.sh b/hack/generate-helm-release.sh index 10a632564e1..f82fb8dfe47 100755 --- a/hack/generate-helm-release.sh +++ b/hack/generate-helm-release.sh @@ -94,13 +94,17 @@ 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-ubuntu=projects.registry.vmware.com/antrea/antrea-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" diff --git a/hack/generate-manifest-octant.sh b/hack/generate-manifest-octant.sh index d3b7d0e889d..23ed064847a 100755 --- a/hack/generate-manifest-octant.sh +++ b/hack/generate-manifest-octant.sh @@ -114,7 +114,7 @@ $KUSTOMIZE edit add base $BASE find ../../patches/$MODE -name \*.yml -exec cp {} . \; if [ "$MODE" == "dev" ]; then - $KUSTOMIZE edit set image octant-antrea=projects.registry.vmware.com/antrea/octant-antrea-ubuntu:latest + $KUSTOMIZE edit set image octant-antrea=antrea/octant-antrea-ubuntu:latest $KUSTOMIZE edit add patch --path imagePullPolicy.yml fi diff --git a/hack/generate-manifest-windows.sh b/hack/generate-manifest-windows.sh index 77c68067551..19858085f7a 100755 --- a/hack/generate-manifest-windows.sh +++ b/hack/generate-manifest-windows.sh @@ -113,7 +113,7 @@ $KUSTOMIZE edit add base $BASE find ../../patches/$MODE -name \*.yml -exec cp {} . \; if [ "$MODE" == "dev" ]; then - $KUSTOMIZE edit set image antrea-windows=projects.registry.vmware.com/antrea/antrea-windows:latest + $KUSTOMIZE edit set image antrea-windows=antrea/antrea-windows:latest $KUSTOMIZE edit add patch --path imagePullPolicy.yml fi diff --git a/hack/netpol-generator/test-kind.sh b/hack/netpol-generator/test-kind.sh index b8e1aa02710..ddf23c8a994 100755 --- a/hack/netpol-generator/test-kind.sh +++ b/hack/netpol-generator/test-kind.sh @@ -27,7 +27,7 @@ JOB_NAME=job.batch/cyclonus kind create cluster --config "$KIND_CONFIG" -kind load docker-image projects.registry.vmware.com/antrea/antrea-ubuntu:latest +kind load docker-image antrea/antrea-ubuntu:latest # pre-load cyclonus image docker pull mfenwick100/cyclonus:v0.4.7 diff --git a/hack/netpol/test-kind.sh b/hack/netpol/test-kind.sh index 84622ddf28a..c73635cde3b 100755 --- a/hack/netpol/test-kind.sh +++ b/hack/netpol/test-kind.sh @@ -27,7 +27,7 @@ JOB_NAME=job.batch/netpol echo "===> Creating Kind cluster <===" kind create cluster --config $KIND_CONFIG -kind load docker-image projects.registry.vmware.com/antrea/antrea-ubuntu:latest +kind load docker-image antrea/antrea-ubuntu:latest kind load docker-image antrea/netpol:latest # pre-load the test container image on all the Nodes docker pull antrea/netpol-test diff --git a/multicluster/build/yamls/antrea-multicluster-leader-namespaced.yml b/multicluster/build/yamls/antrea-multicluster-leader-namespaced.yml index fcb376d8cda..6755a466504 100644 --- a/multicluster/build/yamls/antrea-multicluster-leader-namespaced.yml +++ b/multicluster/build/yamls/antrea-multicluster-leader-namespaced.yml @@ -379,7 +379,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: projects.registry.vmware.com/antrea/antrea-mc-controller:latest + image: antrea/antrea-mc-controller:latest imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/multicluster/build/yamls/antrea-multicluster-member.yml b/multicluster/build/yamls/antrea-multicluster-member.yml index ca1601783ce..12263c286d7 100644 --- a/multicluster/build/yamls/antrea-multicluster-member.yml +++ b/multicluster/build/yamls/antrea-multicluster-member.yml @@ -1003,7 +1003,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: projects.registry.vmware.com/antrea/antrea-mc-controller:latest + image: antrea/antrea-mc-controller:latest imagePullPolicy: IfNotPresent livenessProbe: httpGet: diff --git a/multicluster/config/overlays/leader-ns/coverage/manager_command_patch_coverage.yaml b/multicluster/config/overlays/leader-ns/coverage/manager_command_patch_coverage.yaml index ae967bb6066..e683f7ac078 100644 --- a/multicluster/config/overlays/leader-ns/coverage/manager_command_patch_coverage.yaml +++ b/multicluster/config/overlays/leader-ns/coverage/manager_command_patch_coverage.yaml @@ -10,4 +10,4 @@ spec: - command: ["/bin/sh"] args: ["-c", "/antrea-mc-controller-coverage -test.run=TestBincoverRunMain -test.coverprofile=antrea-mc-controller.cov.out leader --config=/controller_manager_config.yaml; while true; do sleep 5 & wait $!; done"] name: antrea-mc-controller - image: projects.registry.vmware.com/antrea/antrea-mc-controller-coverage:latest + image: antrea/antrea-mc-controller-coverage:latest diff --git a/multicluster/config/overlays/member/coverage/manager_command_patch_coverage.yaml b/multicluster/config/overlays/member/coverage/manager_command_patch_coverage.yaml index dabbc4c7ac9..34fb88f28a6 100644 --- a/multicluster/config/overlays/member/coverage/manager_command_patch_coverage.yaml +++ b/multicluster/config/overlays/member/coverage/manager_command_patch_coverage.yaml @@ -10,4 +10,4 @@ spec: - command: ["/bin/sh"] args: ["-c", "/antrea-mc-controller-coverage -test.run=TestBincoverRunMain -test.coverprofile=antrea-mc-controller.cov.out member --config=/controller_manager_config.yaml; while true; do sleep 5 & wait $!; done"] name: antrea-mc-controller - image: projects.registry.vmware.com/antrea/antrea-mc-controller-coverage:latest + image: antrea/antrea-mc-controller-coverage:latest diff --git a/multicluster/hack/generate-manifest.sh b/multicluster/hack/generate-manifest.sh index 8b82e35c8de..6656c6fe7b2 100755 --- a/multicluster/hack/generate-manifest.sh +++ b/multicluster/hack/generate-manifest.sh @@ -143,7 +143,7 @@ fi if [ "$MODE" == "release" ]; then $KUSTOMIZE edit set image antrea/antrea-mc-controller=$IMG_NAME:$IMG_TAG else - $KUSTOMIZE edit set image antrea/antrea-mc-controller=projects.registry.vmware.com/antrea/antrea-mc-controller:latest + $KUSTOMIZE edit set image antrea/antrea-mc-controller=antrea/antrea-mc-controller:latest fi if [ "$OVERLAY" == "member" ] && $COVERAGE; then diff --git a/test/e2e/README.md b/test/e2e/README.md index dea232d0377..2582f22e213 100644 --- a/test/e2e/README.md +++ b/test/e2e/README.md @@ -207,10 +207,10 @@ usage of this script and the options, run: ``` You can also run the e2e tests with an existing Kind cluster. Refer to this -[document](/docs/kind.md) for instructions on how to create a Kind cluster and -use Antrea as the CNI. You need at least one control-plane Node and one worker -Node. Before running the Go e2e tests, you will also need to copy the Antrea -manifest to the control-plane Docker container: +[document](../../docs/kind.md) for instructions on how to create a Kind cluster +and use Antrea as the CNI. You need at least one control-plane Node and one +worker Node. Before running the Go e2e tests, you will also need to copy the +Antrea manifest to the control-plane Docker container: ```bash ./hack/generate-manifest.sh | docker exec -i kind-control-plane dd of=/root/antrea.yml @@ -231,7 +231,7 @@ then make the code changes on the local repo and You can load the new image into the kind cluster using the command below: ```bash -kind load docker-image projects.registry.vmware.com/antrea/antrea-ubuntu:latest --name +kind load docker-image antrea/antrea-ubuntu:latest --name ``` By default, if a test case fails, we write some useful debug information to a diff --git a/test/e2e/infra/vagrant/push_antrea.sh b/test/e2e/infra/vagrant/push_antrea.sh index 848f6da7d36..bdf51fb4f2d 100755 --- a/test/e2e/infra/vagrant/push_antrea.sh +++ b/test/e2e/infra/vagrant/push_antrea.sh @@ -62,7 +62,7 @@ esac done SAVED_ANTREA_IMG=/tmp/antrea-ubuntu.tar -ANTREA_IMG_NAME=projects.registry.vmware.com/antrea/antrea-ubuntu:latest +ANTREA_IMG_NAME=antrea/antrea-ubuntu:latest THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" @@ -158,7 +158,7 @@ function copyManifestToNodes() { FLOW_AGG_YML="/tmp/flow-aggregator.yml" SAVED_FLOW_AGG_IMG=/tmp/flow-aggregator.tar -FLOW_AGG_IMG_NAME=projects.registry.vmware.com/antrea/flow-aggregator:latest +FLOW_AGG_IMG_NAME=antrea/flow-aggregator:latest # If a flow collector address is also provided, we update the Antrea # manifest to enable FlowExporter.