Merge linkerd2/cni-plugin history into linkerd2-proxy-init

.github/workflows/go.yml

@@ -11,9 +11,10 @@ on:
 jobs:
   lint:
     runs-on: ubuntu-20.04
+    container: ghcr.io/linkerd/dev:v38-go
     steps:
       - uses: actions/checkout@755da8c3cf115ac066823e79a1e1788f8940201b
-      - uses: golangci/golangci-lint-action@0ad9a0988b3973e851ab0a07adf248ec2e100376
+      - run: just go-lint --verbose --timeout=10m
 
   fmt:
     runs-on: ubuntu-20.04

Dockerfile

@@ -9,6 +9,7 @@ FROM --platform=$BUILDPLATFORM ghcr.io/linkerd/dev:v38-go as go
 WORKDIR /build
 COPY --link go.mod go.sum .
 COPY --link ./proxy-init ./proxy-init
+COPY --link ./internal ./internal
 RUN go mod download
 ARG TARGETARCH
 RUN CGO_ENABLED=0 GOOS=linux GOARCH=$TARGETARCH GO111MODULE=on \

cni-plugin/deployment/linkerd-cni.conf.default

@@ -0,0 +1,23 @@
+{
+    "name": "linkerd-cni",
+    "type": "linkerd-cni",
+    "log_level": "info",
+    "policy": {
+        "type": "k8s",
+        "k8s_api_root": "https://__KUBERNETES_SERVICE_HOST__:__KUBERNETES_SERVICE_PORT__",
+        "k8s_auth_token": "__SERVICEACCOUNT_TOKEN__"
+    },
+    "kubernetes": {
+        "kubeconfig": "__KUBECONFIG_FILEPATH__"
+    },
+    "linkerd": {
+        "incoming-proxy-port": 4143,
+        "outgoing-proxy-port": 4140,
+        "proxy-uid": 2102,
+        "ports-to-redirect": [],
+        "inbound-ports-to-ignore": [],
+        "outbound-ports-to-ignore": [],
+        "simulate": false,
+        "use-wait-flag": false
+    }
+}

cni-plugin/deployment/scripts/filter.jq

@@ -0,0 +1,13 @@
+if has("type") then
+   .plugins = [.]
+   | del(.plugins[0].cniVersion)
+   | to_entries
+   | map(select(.key=="plugins"))
+   | from_entries
+   | .plugins += [$CNI_TMP_CONF_DATA]
+   | .name = "k8s-pod-network"
+   | .cniVersion = "0.3.0"
+else
+  del(.plugins[]? | select(.type == "linkerd-cni"))
+  | .plugins += [$CNI_TMP_CONF_DATA]
+end