Skip to content

Commit 8bfdbd8

Browse files
authored
Remove Antrea Octant plugin (#5049)
The plugin was deprecated in Antrea v1.12 and replaced with the Antrea UI. It is being removed as of Antrea v1.13. We remove all references to Octant in the repo, except for a single disclaimer in docs/octant-plugin-installation.md. For #4640 Signed-off-by: Antonin Bas <[email protected]>
1 parent 5562b29 commit 8bfdbd8

26 files changed

+10
-3504
lines changed

.github/dependabot.yml

-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ updates:
1313
update-types: ["version-update:semver-major", "version-update:semver-minor"] # ignore all except for patch updates
1414
- dependency-name: "github.com/vmware/go-ipfix"
1515
- dependency-name: "github.com/TomCodeLV/OVSDB-golang-lib"
16-
- dependency-name: "github.com/vmware-tanzu/octant"
17-
update-types: ["version-update:semver-major", "version-update:semver-minor"] # ignore all except for patch updates
1816
- dependency-name: "github.com/aws/*" # updates are too frequent
1917
- dependency-name: "antrea.io/ofnet"
2018
- dependency-name: "antrea.io/libOpenflow"

.github/workflows/build.yml

-17
Original file line numberDiff line numberDiff line change
@@ -112,23 +112,6 @@ jobs:
112112
docker push antrea/antrea-windows:latest
113113
shell: bash
114114

115-
build-octant-antrea-ubuntu:
116-
needs: check-changes
117-
if: ${{ needs.check-changes.outputs.has_changes == 'yes' || github.event_name == 'push' }}
118-
runs-on: [ubuntu-latest]
119-
steps:
120-
- uses: actions/checkout@v3
121-
- name: Build octant-antrea-ubuntu Docker image
122-
run: make octant-antrea-ubuntu
123-
- name: Push octant-antrea-ubuntu Docker image to registry
124-
if: ${{ github.repository == 'antrea-io/antrea' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
125-
env:
126-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
127-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
128-
run: |
129-
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
130-
docker push antrea/octant-antrea-ubuntu:latest
131-
132115
build-antrea-mc-controller:
133116
needs: check-changes
134117
if: ${{ needs.check-changes.outputs.has_changes == 'yes' || github.event_name == 'push' }}

.github/workflows/build_tag.yml

-15
Original file line numberDiff line numberDiff line change
@@ -74,21 +74,6 @@ jobs:
7474
docker push antrea/antrea-windows:"${VERSION}"
7575
shell: bash
7676

77-
build-octant-antrea-ubuntu:
78-
runs-on: [ubuntu-latest]
79-
needs: get-version
80-
steps:
81-
- uses: actions/checkout@v3
82-
- name: Build octant-antrea-ubuntu Docker image and push to registry
83-
env:
84-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
85-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
86-
VERSION: ${{ needs.get-version.outputs.version }}
87-
run: |
88-
make octant-antrea-ubuntu
89-
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
90-
docker push antrea/octant-antrea-ubuntu:"${VERSION}"
91-
9277
build-antrea-mc-controller:
9378
runs-on: [ubuntu-latest]
9479
needs: get-version

.github/workflows/process_release.yml

-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ jobs:
1515
go-version-file: 'go.mod'
1616
# make sure the latest patch version is used
1717
check-latest: true
18-
# release assets include Octant plugin
19-
cache-dependency-path: '**/go.sum'
2018
- name: Build assets
2119
env:
2220
TAG: ${{ github.ref }}

Makefile

+1-22
Original file line numberDiff line numberDiff line change
@@ -214,10 +214,8 @@ endif
214214
docker-tidy: $(DOCKER_CACHE)
215215
@rm -f go.sum
216216
@$(DOCKER_ENV) $(GO) mod tidy
217-
@rm -f plugins/octant/go.sum
218-
@$(DOCKER_ENV) bash -c "cd plugins/octant && $(GO) mod tidy"
219217
@chmod -R 0755 $<
220-
@chmod 0644 go.sum plugins/octant/go.sum
218+
@chmod 0644 go.sum
221219

222220
ANTCTL_BINARIES := antctl-darwin antctl-linux antctl-windows
223221
$(ANTCTL_BINARIES): antctl-%:
@@ -263,8 +261,6 @@ add-copyright:
263261
tidy:
264262
@rm -f go.sum
265263
@$(GO) mod tidy
266-
@rm -f plugins/octant/go.sum
267-
@cd plugins/octant && $(GO) mod tidy
268264

269265
.PHONY: .linux-test-integration
270266
.linux-test-integration: .coverage
@@ -277,8 +273,6 @@ test-tidy:
277273
@echo
278274
@echo "===> Checking go.mod tidiness <==="
279275
@GO=$(GO) $(CURDIR)/hack/tidy-check.sh
280-
@echo "===> Checking octant plugins go.mod tidiness <==="
281-
@GO=$(GO) $(CURDIR)/hack/tidy-check.sh plugins/octant
282276

283277
.PHONY: fmt
284278
fmt:
@@ -297,21 +291,13 @@ golangci: $(GOLANGCI_LINT_BIN)
297291
@GOOS=linux $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml
298292
@echo "===> Running golangci (windows) <==="
299293
@GOOS=windows $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml
300-
@echo "===> Running golangci for Octant plugin (linux) <==="
301-
@cd plugins/octant && GOOS=linux CGO_ENABLED=0 $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml
302-
@echo "===> Running golangci for Octant plugin (windows) <==="
303-
@cd plugins/octant && GOOS=windows CGO_ENABLED=0 $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml
304294

305295
.PHONY: golangci-fix
306296
golangci-fix: $(GOLANGCI_LINT_BIN)
307297
@echo "===> Running golangci (linux) <==="
308298
@GOOS=linux $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml --fix
309299
@echo "===> Running golangci (windows) <==="
310300
@GOOS=windows $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml --fix
311-
@echo "===> Running golangci for Octant plugin (linux) <==="
312-
@cd plugins/octant && GOOS=linux CGO_ENABLED=0 $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml --fix
313-
@echo "===> Running golangci for Octant plugin (windows) <==="
314-
@cd plugins/octant && GOOS=windows CGO_ENABLED=0 $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml --fix
315301

316302
.PHONY: clean
317303
clean:
@@ -395,7 +381,6 @@ build-scale-simulator:
395381
manifest:
396382
@echo "===> Generating dev manifest for Antrea <==="
397383
$(CURDIR)/hack/generate-standard-manifests.sh --mode dev --out build/yamls
398-
$(CURDIR)/hack/generate-manifest-octant.sh --mode dev > build/yamls/antrea-octant.yml
399384
$(CURDIR)/hack/generate-manifest-windows.sh --mode dev > build/yamls/antrea-windows.yml
400385
$(CURDIR)/hack/generate-manifest-flow-aggregator.sh --mode dev > build/yamls/flow-aggregator.yml
401386

@@ -410,12 +395,6 @@ manifest-coverage:
410395
$(CURDIR)/hack/generate-manifest.sh --mode dev --ipsec --coverage > build/yamls/antrea-ipsec-coverage.yml
411396
$(CURDIR)/hack/generate-manifest-flow-aggregator.sh --mode dev --coverage > build/yamls/flow-aggregator-coverage.yml
412397

413-
.PHONY: octant-antrea-ubuntu
414-
octant-antrea-ubuntu:
415-
@echo "===> Building antrea/octant-antrea-ubuntu Docker image <==="
416-
docker build --pull -t antrea/octant-antrea-ubuntu:$(DOCKER_IMG_VERSION) -f build/images/Dockerfile.octant.ubuntu $(DOCKER_BUILD_ARGS) .
417-
docker tag antrea/octant-antrea-ubuntu:$(DOCKER_IMG_VERSION) antrea/octant-antrea-ubuntu
418-
419398
.PHONY: antrea-mc-controller
420399
antrea-mc-controller:
421400
@echo "===> Building antrea/antrea-mc-controller Docker image <==="

build/images/Dockerfile.octant.ubuntu

-41
This file was deleted.

build/yamls/antrea-octant.yml

-71
This file was deleted.

build/yamls/octant/base/deployment.yml

-56
This file was deleted.

build/yamls/octant/base/kustomization.yml

-11
This file was deleted.

build/yamls/octant/base/service.yml

-11
This file was deleted.

build/yamls/octant/patches/dev/imagePullPolicy.yml

-10
This file was deleted.

build/yamls/octant/patches/release/.gitignore

-1
This file was deleted.

ci/check-manifest.sh

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ YAMLS=(
3131
"build/yamls/antrea-eks.yml"
3232
"build/yamls/antrea-gke.yml"
3333
"build/yamls/antrea-aks.yml"
34-
"build/yamls/antrea-octant.yml"
3534
"build/yamls/antrea-windows.yml"
3635
"build/yamls/flow-aggregator.yml"
3736
)

ci/golicense/run.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ failed_binaries=""
3030

3131
for f in "$1"/*; do
3232
[ -e "$f" ] || continue
33-
if [[ $f =~ antrea-agent || $f =~ antrea-controller || $f =~ antrea-cni || $f =~ antctl || $f =~ antrea-octant-plugin ]]; then
33+
if [[ $f =~ antrea-agent || $f =~ antrea-controller || $f =~ antrea-cni || $f =~ antctl ]]; then
3434
base=$(basename $f)
3535
echo "Processing $base"
3636
echo "****************"
@@ -41,8 +41,7 @@ done
4141

4242
echo "Merging all files as $REPORTS_DIR/ALL.deps.txt"
4343
echo "****************"
44-
# The 'grep -v' is to remove the dependency of the Antrea Octant plugin to Antrea
45-
cat "$REPORTS_DIR"/*.deps.txt | grep -v "\.\./\.\." | sort | uniq | tee "$REPORTS_DIR/ALL.deps.txt"
44+
cat "$REPORTS_DIR"/*.deps.txt | sort | uniq | tee "$REPORTS_DIR/ALL.deps.txt"
4645
echo "****************"
4746

4847
rc=

0 commit comments

Comments
 (0)