fix(ci): remove sanity tests

Seagate · Mar 10, 2020 · 716527a · 716527a
1 parent 75637bb
commit 716527a
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 44 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -2,16 +2,6 @@ stages:
   - test
   - release
 
-k8s sanity tests:
-  stage: test
-  image: golang:1.12-alpine3.9
-  before_script:
-    - apk add --update git gcc musl-dev bash
-  script:
-    - test/sanity
-  except:
-    - tags
-
 build dirty docker image:
   stage: test
   image: docker:stable
@@ -21,7 +11,8 @@ build dirty docker image:
     - apk add --update make
     - echo $CI_REGISTRY_PASSWORD | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin
   script:
-    - VERSION=dirty make push
+    - echo $CI_COMMIT_TAG
+    - VERSION="$(git log | head -n 1 | awk '{ print $2 }')" make push
   except:
     - tags
 

diff --git a/deploy/daemonset.yml b/deploy/daemonset.yml
@@ -2,32 +2,28 @@
 apiVersion: apps/v1
 kind: DaemonSet
 metadata:
-  name: dothill-node
+  name: dothill-node-server
 
 spec:
   selector:
     matchLabels:
-      name: dothill-node
+      name: dothill-node-server
   template:
     metadata:
       labels:
-        name: dothill-node
+        name: dothill-node-server
     spec:
       imagePullSecrets:
         - name: regcred
       containers:
-        # - name: dothill-node
-        #   image: docker-registry.enix.io/enix/dothill-provisioner:rc
-        #   command:
-        #     - dothill-node
-        #     - -bind=unix:///csi/csi.sock
-        #   lifecycle:
-        #     preStop:
-        #       exec:
-        #         command: ["/bin/sh", "-c", "rm -rf /csi/csi.sock"]
-        #   volumeMounts:
-        #     - name: plugin-dir
-        #       mountPath: /csi
+        - name: dothill-node
+          image: docker-registry.enix.io/enix/dothill-provisioner:dirty
+          command:
+            - dothill-node
+            - -bind=unix:///csi/csi.sock
+          volumeMounts:
+            - name: plugin-dir
+              mountPath: /csi
         - name: driver-registrar
           image: quay.io/k8scsi/csi-node-driver-registrar:v1.0.2
           args:

diff --git a/deploy/deployment.yml b/deploy/deployment.yml
@@ -2,25 +2,28 @@
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: dothill-controller
+  name: dothill-controller-server
 
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: dothill-controller
+      app: dothill-controller-server
   template:
     metadata:
       labels:
-        app: dothill-controller
+        app: dothill-controller-server
     spec:
       serviceAccount: csi-provisioner
       containers:
-        # - name: dothill-controller
-        #   image: docker-registry.enix.io/enix/dothill-provisioner:rc
-        #   volumeMounts:
-        #     - name: socket-dir
-        #       mountPath: /csi
+        - name: dothill-controller
+          image: docker-registry.enix.io/enix/dothill-provisioner:dirty
+          command:
+            - dothill-controller
+            - -bind=unix:///csi/csi.sock
+          volumeMounts:
+            - name: socket-dir
+              mountPath: /csi
         - name: csi-provisioner
           image: quay.io/k8scsi/csi-provisioner:canary
           args:
@@ -39,16 +42,25 @@ spec:
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
-        - name: tcp-controller
-          image: alpine/socat
-          command:
-            - socat
-            - -v
-            - UNIX-LISTEN:/csi/csi.sock,reuseaddr,fork
-            - TCP:10.14.145.17:10000
-          volumeMounts:
-            - name: socket-dir
-              mountPath: /csi
+        # - name: csi-resizer
+        #   image: quay.io/k8scsi/csi-resizer:canary
+        #   args:
+        #     - --csi-address=/csi/csi.sock
+        #     - --leader-election
+        #   imagePullPolicy: IfNotPresent
+        #   volumeMounts:
+        #     - name: socket-dir
+        #       mountPath: /csi
+        # - name: tcp-controller
+        #   image: alpine/socat
+        #   command:
+        #     - socat
+        #     - -v
+        #     - UNIX-LISTEN:/csi/csi.sock,reuseaddr,fork
+        #     - TCP:10.14.145.17:10000
+        #   volumeMounts:
+        #     - name: socket-dir
+        #       mountPath: /csi
       volumes:
         - name: socket-dir
           emptyDir:
diff --git a/deploy/rbac.yml b/deploy/rbac.yml
@@ -32,6 +32,9 @@ rules:
   - apiGroups: [""]
     resources: ["persistentvolumeclaims"]
     verbs: ["get", "list", "watch", "update"]
+  # - apiGroups: [""]
+  #   resources: ["persistentvolumeclaims/status"]
+  #   verbs: ["update", "patch"]
   - apiGroups: ["storage.k8s.io"]
     resources: ["storageclasses"]
     verbs: ["get", "list", "watch"]