Skip to content

Commit

Permalink
ci: Remove window cni binaries update code (#2097)
Browse files Browse the repository at this point in the history
  • Loading branch information
vipul-21 authored Aug 1, 2023
1 parent 7a41178 commit 0124827
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 95 deletions.
17 changes: 0 additions & 17 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,13 @@ endif

## Image name definitions.
ACNCLI_IMAGE = acncli
CNI_PLUGIN_IMAGE = azure-cni-plugin
CNI_DROPGZ_IMAGE = cni-dropgz
CNI_DROPGZ_TEST_IMAGE = cni-dropgz-test
CNS_IMAGE = azure-cns
NPM_IMAGE = azure-npm

## Image platform tags.
ACNCLI_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(ACN_VERSION)
CNI_PLUGIN_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_VERSION)
CNI_DROPGZ_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_DROPGZ_VERSION)
CNI_DROPGZ_TEST_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_DROPGZ_TEST_VERSION)
CNS_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNS_VERSION)
Expand Down Expand Up @@ -440,21 +438,6 @@ npm-image-pull: ## pull cns container image.
IMAGE=$(NPM_IMAGE) \
TAG=$(NPM_PLATFORM_TAG)

# cni-plugin - Specifically used for windows clusters, will be removed once we have Dropgz for windows
cni-plugin-image-name-and-tag: # util target to print the CNI plugin image name and tag.
@echo $(IMAGE_REGISTRY)/$(CNI_PLUGIN_IMAGE):$(CNI_PLUGIN_PLATFORM_TAG)

cni-plugin-image: ## build cni plugin container image.
$(MAKE) container \
DOCKERFILE=cni/build/$(OS).Dockerfile \
IMAGE=$(CNI_PLUGIN_IMAGE) \
EXTRA_BUILD_ARGS='--build-arg CNI_AI_PATH=$(CNI_AI_PATH) --build-arg CNI_AI_ID=$(CNI_AI_ID) --build-arg OS_VERSION=$(OS_VERSION)' \
PLATFORM=$(PLATFORM) \
TAG=$(CNI_PLUGIN_PLATFORM_TAG) \
OS=$(OS) \
ARCH=$(ARCH) \
OS_VERSION=$(OS_VERSION)


## Legacy

Expand Down
21 changes: 0 additions & 21 deletions cni/build/windows.Dockerfile

This file was deleted.

57 changes: 0 additions & 57 deletions hack/scripts/updatecni.ps1

This file was deleted.

0 comments on commit 0124827

Please sign in to comment.