Skip to content

Commit 5f4ff11

Browse files
rbtrrbtr
authored
chore: rip out dropgz (#3032)
rip out dropgz Signed-off-by: Evan Baker <[email protected]>
1 parent 92abdfe commit 5f4ff11

File tree

5 files changed

+1
-186
lines changed

5 files changed

+1
-186
lines changed

‎.pipelines/pipeline.yaml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -139,20 +139,6 @@ stages:
139139
name: cni
140140
os: windows
141141
os_version: ltsc2025
142-
cni_dropgz_linux_amd64:
143-
arch: amd64
144-
name: cni-dropgz
145-
os: linux
146-
cni_dropgz_windows2019_amd64:
147-
arch: amd64
148-
name: cni-dropgz
149-
os: windows
150-
os_version: ltsc2019
151-
cni_dropgz_windows2022_amd64:
152-
arch: amd64
153-
name: cni-dropgz
154-
os: windows
155-
os_version: ltsc2022
156142
cns_linux_amd64:
157143
arch: amd64
158144
name: cns
@@ -206,10 +192,6 @@ stages:
206192
arch: arm64
207193
name: cni
208194
os: linux
209-
cni_dropgz_linux_arm64:
210-
arch: arm64
211-
name: cni-dropgz
212-
os: linux
213195
cns_linux_arm64:
214196
arch: arm64
215197
name: cns
@@ -250,10 +232,6 @@ stages:
250232
name: cni
251233
os_versions: ltsc2019 ltsc2022 ltsc2025
252234
platforms: linux/amd64 linux/arm64 windows/amd64
253-
cni_dropgz:
254-
name: cni-dropgz
255-
os_versions: ltsc2019 ltsc2022
256-
platforms: linux/amd64 linux/arm64 windows/amd64
257235
cns:
258236
name: cns
259237
os_versions: ltsc2019 ltsc2022 ltsc2025

‎.pipelines/run-pipeline.yaml‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -157,23 +157,6 @@ stages:
157157
name: cni
158158
os: windows
159159
os_version: ltsc2025
160-
cni_dropgz_linux_amd64:
161-
Suffix: cni_dropgz_linux_amd64
162-
arch: amd64
163-
name: cni-dropgz
164-
os: linux
165-
cni_dropgz_windows2019_amd64:
166-
Suffix: cni_dropgz_windows2019_amd64
167-
arch: amd64
168-
name: cni-dropgz
169-
os: windows
170-
os_version: ltsc2019
171-
cni_dropgz_windows2022_amd64:
172-
Suffix: cni_dropgz_windows2022_amd64
173-
arch: amd64
174-
name: cni-dropgz
175-
os: windows
176-
os_version: ltsc2022
177160
cns_linux_amd64:
178161
Suffix: cns_linux_amd64
179162
arch: amd64
@@ -247,11 +230,6 @@ stages:
247230
name: cni
248231
os: linux
249232
Suffix: cni-linux-arm64
250-
cni_dropgz_linux_arm64:
251-
arch: arm64
252-
name: cni-dropgz
253-
os: linux
254-
Suffix: cni-dropgz
255233
cns_linux_arm64:
256234
arch: arm64
257235
name: cns
@@ -310,11 +288,6 @@ stages:
310288
os_versions: ltsc2019 ltsc2022 ltsc2025
311289
platforms: linux/amd64 linux/arm64 windows/amd64
312290
Suffix: cni
313-
cni_dropgz:
314-
name: cni-dropgz
315-
os_versions: ltsc2019 ltsc2022
316-
platforms: linux/amd64 linux/arm64 windows/amd64
317-
Suffix: cni-dropgz
318291
cns:
319292
name: cns
320293
os_versions: ltsc2019 ltsc2022 ltsc2025

‎Makefile‎

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ endif
3636
REPO_ROOT = $(shell git rev-parse --show-toplevel)
3737
REVISION ?= $(shell git rev-parse --short HEAD)
3838
ACN_VERSION ?= $(shell git describe --exclude "azure-ipam*" --exclude "dropgz*" --exclude "zapai*" --exclude "ipv6-hp-bpf*" --tags --always)
39-
IPV6_HP_BPF_VERSION ?= $(notdir $(shell git describe --match "ipv6-hp-bpf*" --tags --always))
39+
IPV6_HP_BPF_VERSION ?= $(notdir $(shell git describe --match "ipv6-hp-bpf*" --tags --always))
4040
AZURE_IPAM_VERSION ?= $(notdir $(shell git describe --match "azure-ipam*" --tags --always))
4141
CNI_VERSION ?= $(ACN_VERSION)
42-
CNI_DROPGZ_VERSION ?= $(notdir $(shell git describe --match "dropgz*" --tags --always))
4342
CNS_VERSION ?= $(ACN_VERSION)
4443
NPM_VERSION ?= $(ACN_VERSION)
4544
ZAPAI_VERSION ?= $(notdir $(shell git describe --match "zapai*" --tags --always))
@@ -109,7 +108,6 @@ IPV6_HP_BPF_ARCHIVE_NAME = ipv6-hp-bpf-$(GOOS)-$(GOARCH)-$(IPV6_HP_BPF_VERSION).
109108

110109
# Image info file names.
111110
CNI_IMAGE_INFO_FILE = azure-cni-$(CNI_VERSION).txt
112-
CNI_DROPGZ_IMAGE_INFO_FILE = cni-dropgz-$(CNI_DROPGZ_VERSION).txt
113111
CNS_IMAGE_INFO_FILE = azure-cns-$(CNS_VERSION).txt
114112
NPM_IMAGE_INFO_FILE = azure-npm-$(NPM_VERSION).txt
115113

@@ -159,9 +157,6 @@ ipv6-hp-bpf-version: ## prints the ipv6-hp-bpf version
159157
cni-version: ## prints the cni version
160158
@echo $(CNI_VERSION)
161159

162-
cni-dropgz-version: ## prints the cni-dropgz version
163-
@echo $(CNI_DROPGZ_VERSION)
164-
165160
cns-version:
166161
@echo $(CNS_VERSION)
167162

@@ -267,7 +262,6 @@ ACNCLI_IMAGE = acncli
267262
AZURE_IPAM_IMAGE = azure-ipam
268263
IPV6_HP_BPF_IMAGE = ipv6-hp-bpf
269264
CNI_IMAGE = azure-cni
270-
CNI_DROPGZ_IMAGE = cni-dropgz
271265
CNS_IMAGE = azure-cns
272266
NPM_IMAGE = azure-npm
273267

@@ -278,7 +272,6 @@ AZURE_IPAM_WINDOWS_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$
278272
IPV6_HP_BPF_IMAGE_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(IPV6_HP_BPF_VERSION)
279273
CNI_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_VERSION)
280274
CNI_WINDOWS_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_VERSION)-$(OS_SKU_WIN)
281-
CNI_DROPGZ_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNI_DROPGZ_VERSION)
282275
CNS_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNS_VERSION)
283276
CNS_WINDOWS_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(CNS_VERSION)-$(OS_SKU_WIN)
284277
NPM_PLATFORM_TAG ?= $(subst /,-,$(PLATFORM))$(if $(OS_VERSION),-$(OS_VERSION),)-$(NPM_VERSION)
@@ -456,32 +449,6 @@ cni-image-pull: ## pull cni container image.
456449
TAG=$(CNI_PLATFORM_TAG)
457450

458451

459-
# cni-dropgz
460-
461-
cni-dropgz-image-name: # util target to print the CNI dropgz image name.
462-
@echo $(CNI_DROPGZ_IMAGE)
463-
464-
cni-dropgz-image-name-and-tag: # util target to print the CNI dropgz image name and tag.
465-
@echo $(IMAGE_REGISTRY)/$(CNI_DROPGZ_IMAGE):$(CNI_DROPGZ_PLATFORM_TAG)
466-
467-
cni-dropgz-image: ## build cni-dropgz container image.
468-
$(MAKE) container \
469-
DOCKERFILE=dropgz/build/$(OS).Dockerfile \
470-
IMAGE=$(CNI_DROPGZ_IMAGE) \
471-
TAG=$(CNI_DROPGZ_PLATFORM_TAG) \
472-
TARGET=$(OS)
473-
474-
cni-dropgz-image-push: ## push cni-dropgz container image.
475-
$(MAKE) container-push \
476-
IMAGE=$(CNI_DROPGZ_IMAGE) \
477-
TAG=$(CNI_DROPGZ_PLATFORM_TAG)
478-
479-
cni-dropgz-image-pull: ## pull cni-dropgz container image.
480-
$(MAKE) container-pull \
481-
IMAGE=$(CNI_DROPGZ_IMAGE) \
482-
TAG=$(CNI_DROPGZ_PLATFORM_TAG)
483-
484-
485452
# cns
486453

487454
cns-image-name: # util target to print the CNS image name
@@ -638,23 +605,6 @@ cni-skopeo-archive: ## export tar archive of cni multiplat container manifest.
638605
IMAGE=$(CNI_IMAGE) \
639606
TAG=$(CNI_VERSION)
640607

641-
cni-dropgz-manifest-build: ## build cni-dropgz multiplat container manifest.
642-
$(MAKE) manifest-build \
643-
PLATFORMS="$(PLATFORMS)" \
644-
IMAGE=$(CNI_DROPGZ_IMAGE) \
645-
TAG=$(CNI_DROPGZ_VERSION) \
646-
OS_VERSIONS="$(OS_VERSIONS)"
647-
648-
cni-dropgz-manifest-push: ## push cni-dropgz multiplat container manifest
649-
$(MAKE) manifest-push \
650-
IMAGE=$(CNI_DROPGZ_IMAGE) \
651-
TAG=$(CNI_DROPGZ_VERSION)
652-
653-
cni-dropgz-skopeo-archive: ## export tar archive of cni-dropgz multiplat container manifest.
654-
$(MAKE) manifest-skopeo-archive \
655-
IMAGE=$(CNI_DROPGZ_IMAGE) \
656-
TAG=$(CNI_DROPGZ_VERSION)
657-
658608
cns-manifest-build: ## build azure-cns multiplat container manifest.
659609
$(MAKE) manifest-build \
660610
PLATFORMS="$(PLATFORMS)" \

‎dropgz/build/linux.Dockerfile‎

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

‎dropgz/build/windows.Dockerfile‎

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

0 commit comments

Comments
 (0)