From 595c49c9d5632fb44b28cbd380ed072160560e90 Mon Sep 17 00:00:00 2001 From: Curt Bushko Date: Fri, 1 Jul 2022 00:51:08 -0400 Subject: [PATCH] Initial CNI installer & plugin (#1304) * Get structure in place and CNI installer & plugin building --- control-plane/Dockerfile | 1 + control-plane/go.mod | 2 ++ 2 files changed, 3 insertions(+) diff --git a/control-plane/Dockerfile b/control-plane/Dockerfile index c70bcedbb5..459b5f974d 100644 --- a/control-plane/Dockerfile +++ b/control-plane/Dockerfile @@ -69,6 +69,7 @@ CMD /bin/${BIN_NAME} FROM alpine:3.16 AS release-default ARG BIN_NAME=consul-k8s-control-plane +ARG CNI_BIN_NAME=consul-cni ARG PRODUCT_VERSION LABEL name=${BIN_NAME} \ diff --git a/control-plane/go.mod b/control-plane/go.mod index 80f09eabdf..51d2f69b28 100644 --- a/control-plane/go.mod +++ b/control-plane/go.mod @@ -52,6 +52,7 @@ require ( github.com/beorn7/perks v1.0.1 // indirect github.com/bgentry/speakeasy v0.1.0 // indirect github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/containernetworking/cni v1.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661 // indirect github.com/digitalocean/godo v1.10.0 // indirect @@ -69,6 +70,7 @@ require ( github.com/googleapis/gax-go/v2 v2.0.5 // indirect github.com/googleapis/gnostic v0.5.5 // indirect github.com/gophercloud/gophercloud v0.1.0 // indirect + github.com/hashicorp/consul-k8s/control-plane/cni v0.0.0-20220622202014-ebf6603ca2ab // indirect github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-cleanhttp v0.5.2 // indirect github.com/hashicorp/go-immutable-radix v1.3.0 // indirect