Skip to content

Commit 0124827

Browse files
authored
ci: Remove window cni binaries update code (#2097)
1 parent 7a41178 commit 0124827

File tree

3 files changed

+0
-95
lines changed

3 files changed

+0
-95
lines changed

Makefile

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -247,15 +247,13 @@ endif
247247

248248
## Image name definitions.
249249
ACNCLI_IMAGE = acncli
250-
CNI_PLUGIN_IMAGE = azure-cni-plugin
251250
CNI_DROPGZ_IMAGE = cni-dropgz
252251
CNI_DROPGZ_TEST_IMAGE = cni-dropgz-test
253252
CNS_IMAGE = azure-cns
254253
NPM_IMAGE = azure-npm
255254

256255
## Image platform tags.
257256
ACNCLI_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(ACN_VERSION)
258-
CNI_PLUGIN_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_VERSION)
259257
CNI_DROPGZ_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_DROPGZ_VERSION)
260258
CNI_DROPGZ_TEST_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_DROPGZ_TEST_VERSION)
261259
CNS_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNS_VERSION)
@@ -440,21 +438,6 @@ npm-image-pull: ## pull cns container image.
440438
IMAGE=$(NPM_IMAGE) \
441439
TAG=$(NPM_PLATFORM_TAG)
442440

443-
# cni-plugin - Specifically used for windows clusters, will be removed once we have Dropgz for windows
444-
cni-plugin-image-name-and-tag: # util target to print the CNI plugin image name and tag.
445-
@echo $(IMAGE_REGISTRY)/$(CNI_PLUGIN_IMAGE):$(CNI_PLUGIN_PLATFORM_TAG)
446-
447-
cni-plugin-image: ## build cni plugin container image.
448-
$(MAKE) container \
449-
DOCKERFILE=cni/build/$(OS).Dockerfile \
450-
IMAGE=$(CNI_PLUGIN_IMAGE) \
451-
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)' \
452-
PLATFORM=$(PLATFORM) \
453-
TAG=$(CNI_PLUGIN_PLATFORM_TAG) \
454-
OS=$(OS) \
455-
ARCH=$(ARCH) \
456-
OS_VERSION=$(OS_VERSION)
457-
458441

459442
## Legacy
460443

cni/build/windows.Dockerfile

Lines changed: 0 additions & 21 deletions
This file was deleted.

hack/scripts/updatecni.ps1

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)