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

Remove Antrea Octant plugin #5049

Merged
merged 1 commit into from
May 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ updates:
update-types: ["version-update:semver-major", "version-update:semver-minor"] # ignore all except for patch updates
- dependency-name: "github.com/vmware/go-ipfix"
- dependency-name: "github.com/TomCodeLV/OVSDB-golang-lib"
- dependency-name: "github.com/vmware-tanzu/octant"
update-types: ["version-update:semver-major", "version-update:semver-minor"] # ignore all except for patch updates
- dependency-name: "github.com/aws/*" # updates are too frequent
- dependency-name: "antrea.io/ofnet"
- dependency-name: "antrea.io/libOpenflow"
Expand Down
17 changes: 0 additions & 17 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,23 +112,6 @@ jobs:
docker push antrea/antrea-windows:latest
shell: bash

build-octant-antrea-ubuntu:
needs: check-changes
if: ${{ needs.check-changes.outputs.has_changes == 'yes' || github.event_name == 'push' }}
runs-on: [ubuntu-latest]
steps:
- uses: actions/checkout@v3
- name: Build octant-antrea-ubuntu Docker image
run: make octant-antrea-ubuntu
- name: Push octant-antrea-ubuntu Docker image to registry
if: ${{ github.repository == 'antrea-io/antrea' && github.event_name == 'push' && github.ref == 'refs/heads/main' }}
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
run: |
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
docker push antrea/octant-antrea-ubuntu:latest

build-antrea-mc-controller:
needs: check-changes
if: ${{ needs.check-changes.outputs.has_changes == 'yes' || github.event_name == 'push' }}
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/build_tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,21 +74,6 @@ jobs:
docker push antrea/antrea-windows:"${VERSION}"
shell: bash

build-octant-antrea-ubuntu:
runs-on: [ubuntu-latest]
needs: get-version
steps:
- uses: actions/checkout@v3
- name: Build octant-antrea-ubuntu Docker image and push to registry
env:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
VERSION: ${{ needs.get-version.outputs.version }}
run: |
make octant-antrea-ubuntu
echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
docker push antrea/octant-antrea-ubuntu:"${VERSION}"

build-antrea-mc-controller:
runs-on: [ubuntu-latest]
needs: get-version
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/process_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ jobs:
go-version-file: 'go.mod'
# make sure the latest patch version is used
check-latest: true
# release assets include Octant plugin
cache-dependency-path: '**/go.sum'
- name: Build assets
env:
TAG: ${{ github.ref }}
Expand Down
23 changes: 1 addition & 22 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,8 @@ endif
docker-tidy: $(DOCKER_CACHE)
@rm -f go.sum
@$(DOCKER_ENV) $(GO) mod tidy
@rm -f plugins/octant/go.sum
@$(DOCKER_ENV) bash -c "cd plugins/octant && $(GO) mod tidy"
@chmod -R 0755 $<
@chmod 0644 go.sum plugins/octant/go.sum
@chmod 0644 go.sum

ANTCTL_BINARIES := antctl-darwin antctl-linux antctl-windows
$(ANTCTL_BINARIES): antctl-%:
Expand Down Expand Up @@ -263,8 +261,6 @@ add-copyright:
tidy:
@rm -f go.sum
@$(GO) mod tidy
@rm -f plugins/octant/go.sum
@cd plugins/octant && $(GO) mod tidy

.PHONY: .linux-test-integration
.linux-test-integration: .coverage
Expand All @@ -277,8 +273,6 @@ test-tidy:
@echo
@echo "===> Checking go.mod tidiness <==="
@GO=$(GO) $(CURDIR)/hack/tidy-check.sh
@echo "===> Checking octant plugins go.mod tidiness <==="
@GO=$(GO) $(CURDIR)/hack/tidy-check.sh plugins/octant

.PHONY: fmt
fmt:
Expand All @@ -297,21 +291,13 @@ golangci: $(GOLANGCI_LINT_BIN)
@GOOS=linux $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml
@echo "===> Running golangci (windows) <==="
@GOOS=windows $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml
@echo "===> Running golangci for Octant plugin (linux) <==="
@cd plugins/octant && GOOS=linux CGO_ENABLED=0 $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml
@echo "===> Running golangci for Octant plugin (windows) <==="
@cd plugins/octant && GOOS=windows CGO_ENABLED=0 $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml

.PHONY: golangci-fix
golangci-fix: $(GOLANGCI_LINT_BIN)
@echo "===> Running golangci (linux) <==="
@GOOS=linux $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml --fix
@echo "===> Running golangci (windows) <==="
@GOOS=windows $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml --fix
@echo "===> Running golangci for Octant plugin (linux) <==="
@cd plugins/octant && GOOS=linux CGO_ENABLED=0 $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml --fix
@echo "===> Running golangci for Octant plugin (windows) <==="
@cd plugins/octant && GOOS=windows CGO_ENABLED=0 $(GOLANGCI_LINT_BIN) run -c $(CURDIR)/.golangci.yml --fix

.PHONY: clean
clean:
Expand Down Expand Up @@ -395,7 +381,6 @@ build-scale-simulator:
manifest:
@echo "===> Generating dev manifest for Antrea <==="
$(CURDIR)/hack/generate-standard-manifests.sh --mode dev --out build/yamls
$(CURDIR)/hack/generate-manifest-octant.sh --mode dev > build/yamls/antrea-octant.yml
$(CURDIR)/hack/generate-manifest-windows.sh --mode dev > build/yamls/antrea-windows.yml
$(CURDIR)/hack/generate-manifest-flow-aggregator.sh --mode dev > build/yamls/flow-aggregator.yml

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

.PHONY: octant-antrea-ubuntu
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

.PHONY: antrea-mc-controller
antrea-mc-controller:
@echo "===> Building antrea/antrea-mc-controller Docker image <==="
Expand Down
41 changes: 0 additions & 41 deletions build/images/Dockerfile.octant.ubuntu

This file was deleted.

71 changes: 0 additions & 71 deletions build/yamls/antrea-octant.yml

This file was deleted.

56 changes: 0 additions & 56 deletions build/yamls/octant/base/deployment.yml

This file was deleted.

11 changes: 0 additions & 11 deletions build/yamls/octant/base/kustomization.yml

This file was deleted.

11 changes: 0 additions & 11 deletions build/yamls/octant/base/service.yml

This file was deleted.

10 changes: 0 additions & 10 deletions build/yamls/octant/patches/dev/imagePullPolicy.yml

This file was deleted.

1 change: 0 additions & 1 deletion build/yamls/octant/patches/release/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion ci/check-manifest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ YAMLS=(
"build/yamls/antrea-eks.yml"
"build/yamls/antrea-gke.yml"
"build/yamls/antrea-aks.yml"
"build/yamls/antrea-octant.yml"
"build/yamls/antrea-windows.yml"
"build/yamls/flow-aggregator.yml"
)
Expand Down
5 changes: 2 additions & 3 deletions ci/golicense/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ failed_binaries=""

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

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

rc=
Expand Down
Loading