Fix rancher#172 support e2e regression (rancher#173)

* Fix rancher#172 support e2e regression Signed-off-by: David Ko <[email protected]>
mgoltzsche · Jan 26, 2021 · 01eaa8c · 01eaa8c
1 parent a18426d
commit 01eaa8c
Show file tree

Hide file tree

Showing 86 changed files with 22,135 additions and 294 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -11,6 +11,7 @@ steps:
   image: rancher/dapper:v0.4.1
   commands:
   - dapper ci
+  - dapper e2e-test
   volumes:
   - name: docker
     path: /var/run/docker.sock

diff --git a/.gitignore b/.gitignore
@@ -5,3 +5,4 @@
 *.swp
 .idea
 .vscode/
+Dockerfile.dapper[0-9]*
diff --git a/Dockerfile.dapper b/Dockerfile.dapper
@@ -1,4 +1,4 @@
-FROM golang:1.12.1-alpine3.9
+FROM golang:1.15-alpine3.12
 
 ARG DAPPER_HOST_ARCH
 ENV ARCH $DAPPER_HOST_ARCH
@@ -14,13 +14,17 @@ RUN mkdir -p /go/src/golang.org/x && \
     go install golang.org/x/tools/cmd/goimports
 RUN rm -rf /go/src /go/pkg
 RUN if [ "${ARCH}" == "amd64" ]; then \
-        curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.15.0; \
-    fi
+        curl -sL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.36.0; \
+    fi; \
+    curl -sL "https://kind.sigs.k8s.io/dl/v0.10.0/kind-linux-${ARCH}" -o kind && install kind /usr/local/bin; \
+    curl -sLO "https://dl.k8s.io/release/v1.20.2/bin/linux/${ARCH}/kubectl" && install kubectl /usr/local/bin; \
+    curl -sL "https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv3.9.2/kustomize_v3.9.2_linux_${ARCH}.tar.gz" | tar -zxv -C /usr/local/bin;
 
 ENV DAPPER_ENV REPO TAG DRONE_TAG
 ENV DAPPER_SOURCE /go/src/github.com/rancher/local-path-provisioner/
 ENV DAPPER_OUTPUT ./bin ./dist
 ENV DAPPER_DOCKER_SOCKET true
+ENV DAPPER_RUN_ARGS --network=host
 ENV HOME ${DAPPER_SOURCE}
 WORKDIR ${DAPPER_SOURCE}
 

diff --git a/Makefile b/Makefile
@@ -12,4 +12,4 @@ $(TARGETS): .dapper
 
 .DEFAULT_GOAL := default
 
-.PHONY: $(TARGETS)
+.PHONY: $(TARGETS)
diff --git a/README.md b/README.md
@@ -28,6 +28,11 @@ In this setup, the directory `/opt/local-path-provisioner` will be used across a
 kubectl apply -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/deploy/local-path-storage.yaml
 ```
 
+Or, use `kustomize` to deploy.
+```
+kustomize build "github.com/rancher/local-path-provisioner/deploy?ref=master" | kubectl apply -f -
+```
+
 After installation, you should see something like the following:
 ```
 $ kubectl -n local-path-storage get pod
@@ -43,10 +48,14 @@ $ kubectl -n local-path-storage logs -f -l app=local-path-provisioner
 ## Usage
 
 Create a `hostPath` backend Persistent Volume and a pod uses it:
+```
+kubectl create -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pvc/pvc.yaml
+kubectl create -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pod/pod.yaml
+```
 
+Or, use `kustomize` to deploy them.
 ```
-kubectl create -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pvc.yaml
-kubectl create -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pod.yaml
+kustomize build "github.com/rancher/local-path-provisioner/examples/pod?ref=master" | kubectl apply -f -
 ```
 
 You should see the PV has been created:
@@ -77,12 +86,12 @@ kubectl exec volume-test -- sh -c "echo local-path-test > /data/test"
 
 Now delete the pod using
 ```
-kubectl delete -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pod.yaml
+kubectl delete -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pod/pod.yaml
 ```
 
 After confirm that the pod is gone, recreated the pod using
 ```
-kubectl create -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pod.yaml
+kubectl create -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pod/pod.yaml
 ```
 
 Check the volume content:
@@ -93,8 +102,13 @@ local-path-test
 
 Delete the pod and pvc
 ```
-kubectl delete -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pod.yaml
-kubectl delete -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pvc.yaml
+kubectl delete -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pod/pod.yaml
+kubectl delete -f https://raw.githubusercontent.com/rancher/local-path-provisioner/master/examples/pvc/pvc.yaml
+```
+
+Or, use `kustomize` to delete them.
+```
+kustomize build "github.com/rancher/local-path-provisioner/examples/pod?ref=master" | kubectl delete -f -
 ```
 
 The volume content stored on the node will be automatically cleaned up. You can check the log of `local-path-provisioner-xxx` for details.

diff --git a/deploy/example-config.yaml b/deploy/example-config.yaml
@@ -5,66 +5,66 @@ metadata:
   namespace: local-path-storage
 data:
   config.json: |-
-        {
-                "nodePathMap":[
-                {
-                        "node":"DEFAULT_PATH_FOR_NON_LISTED_NODES",
-                        "paths":["/opt/local-path-provisioner"]
-                },
-                {
-                        "node":"yasker-lp-dev1",
-                        "paths":["/opt/local-path-provisioner", "/data1"]
-                },
-                {
-                        "node":"yasker-lp-dev3",
-                        "paths":[]
-                }
-                ]
-        }
+    {
+            "nodePathMap":[
+            {
+                    "node":"DEFAULT_PATH_FOR_NON_LISTED_NODES",
+                    "paths":["/opt/local-path-provisioner"]
+            },
+            {
+                    "node":"yasker-lp-dev1",
+                    "paths":["/opt/local-path-provisioner", "/data1"]
+            },
+            {
+                    "node":"yasker-lp-dev3",
+                    "paths":[]
+            }
+            ]
+    }
   setup: |-
-        #!/bin/sh
-        while getopts "m:s:p:" opt
-        do
-            case $opt in
-                p)
-                absolutePath=$OPTARG
-                ;;
-                s)
-                sizeInBytes=$OPTARG
-                ;;
-                m)
-                volMode=$OPTARG
-                ;;
-            esac
-        done
+    #!/bin/sh
+    while getopts "m:s:p:" opt
+    do
+        case $opt in
+            p)
+            absolutePath=$OPTARG
+            ;;
+            s)
+            sizeInBytes=$OPTARG
+            ;;
+            m)
+            volMode=$OPTARG
+            ;;
+        esac
+    done
 
-        mkdir -m 0777 -p ${absolutePath}
+    mkdir -m 0777 -p ${absolutePath}
   teardown: |-
-        #!/bin/sh
-        while getopts "m:s:p:" opt
-        do
-            case $opt in
-                p)
-                absolutePath=$OPTARG
-                ;;
-                s)
-                sizeInBytes=$OPTARG
-                ;;
-                m)
-                volMode=$OPTARG
-                ;;
-            esac
-        done
+    #!/bin/sh
+    while getopts "m:s:p:" opt
+    do
+        case $opt in
+            p)
+            absolutePath=$OPTARG
+            ;;
+            s)
+            sizeInBytes=$OPTARG
+            ;;
+            m)
+            volMode=$OPTARG
+            ;;
+        esac
+    done
 
-        rm -rf ${absolutePath}
+    rm -rf ${absolutePath}
   helperPod.yaml: |-
-        apiVersion: v1
-        kind: Pod
-        metadata:
-          name: helper-pod
-        spec:
-          containers:
-          - name: helper-pod
-            image: busybox
+    apiVersion: v1
+    kind: Pod
+    metadata:
+      name: helper-pod
+    spec:
+      containers:
+      - name: helper-pod
+        image: busybox
 
 
diff --git a/deploy/kustomization.yaml b/deploy/kustomization.yaml
@@ -1,6 +1,5 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-
 resources:
   - local-path-storage.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,3 +5,4 @@ @@
     *.swp
     .idea
     .vscode/
+    Dockerfile.dapper[0-9]*
Original file line number	Diff line number	Diff line change
Expand Up		@@ -12,4 +12,4 @@ $(TARGETS): .dapper

		.DEFAULT_GOAL := default

		.PHONY: $(TARGETS)
		.PHONY: $(TARGETS)