fix: set adaptors default image pull policy

cnrancher · Jun 30, 2020 · 5bd52a1 · 5bd52a1
1 parent 7414998
commit 5bd52a1
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 2 deletions.
diff --git a/adaptors/ble/deploy/e2e/all_in_one.yaml b/adaptors/ble/deploy/e2e/all_in_one.yaml
@@ -727,6 +727,7 @@ spec:
     spec:
       containers:
       - image: cnrancher/octopus-adaptor-ble:master
+        imagePullPolicy: Always
         name: octopus
         securityContext:
           privileged: true

diff --git a/adaptors/ble/deploy/manifests/workload/daemonset.yaml b/adaptors/ble/deploy/manifests/workload/daemonset.yaml
@@ -19,6 +19,7 @@ spec:
       containers:
         - name: octopus
           image: cnrancher/octopus-adaptor-ble:master
+          imagePullPolicy: Always
           securityContext:
             privileged: true
           volumeMounts:

diff --git a/adaptors/dummy/deploy/e2e/all_in_one.yaml b/adaptors/dummy/deploy/e2e/all_in_one.yaml
@@ -1329,6 +1329,7 @@ spec:
     spec:
       containers:
       - image: cnrancher/octopus-adaptor-dummy:master
+        imagePullPolicy: Always
         name: octopus
         volumeMounts:
         - mountPath: /var/lib/octopus/adaptors/

diff --git a/adaptors/dummy/deploy/manifests/workload/daemonset.yaml b/adaptors/dummy/deploy/manifests/workload/daemonset.yaml
@@ -19,6 +19,7 @@ spec:
       containers:
         - name: octopus
           image: cnrancher/octopus-adaptor-dummy:master
+          imagePullPolicy: Always
           volumeMounts:
             - mountPath: /var/lib/octopus/adaptors/
               name: sockets

diff --git a/adaptors/modbus/deploy/e2e/all_in_one.yaml b/adaptors/modbus/deploy/e2e/all_in_one.yaml
@@ -788,6 +788,7 @@ spec:
     spec:
       containers:
       - image: cnrancher/octopus-adaptor-modbus:master
+        imagePullPolicy: Always
         name: octopus
         securityContext:
           privileged: true

diff --git a/adaptors/modbus/deploy/manifests/workload/daemonset.yaml b/adaptors/modbus/deploy/manifests/workload/daemonset.yaml
@@ -19,6 +19,7 @@ spec:
       containers:
         - name: octopus
           image: cnrancher/octopus-adaptor-modbus:master
+          imagePullPolicy: Always
           volumeMounts:
             - mountPath: /var/lib/octopus/adaptors/
               name: sockets

diff --git a/adaptors/mqtt/deploy/e2e/all_in_one.yaml b/adaptors/mqtt/deploy/e2e/all_in_one.yaml
@@ -289,6 +289,7 @@ spec:
     spec:
       containers:
       - image: cnrancher/octopus-adaptor-mqtt:master
+        imagePullPolicy: Always
         name: octopus
         volumeMounts:
         - mountPath: /var/lib/octopus/adaptors/

diff --git a/adaptors/mqtt/deploy/manifests/workload/daemonset.yaml b/adaptors/mqtt/deploy/manifests/workload/daemonset.yaml
@@ -19,6 +19,7 @@ spec:
       containers:
         - name: octopus
           image: cnrancher/octopus-adaptor-mqtt:master
+          imagePullPolicy: Always
           volumeMounts:
             - mountPath: /var/lib/octopus/adaptors/
               name: sockets

diff --git a/adaptors/opcua/deploy/e2e/all_in_one.yaml b/adaptors/opcua/deploy/e2e/all_in_one.yaml
@@ -760,6 +760,7 @@ spec:
     spec:
       containers:
       - image: cnrancher/octopus-adaptor-opcua:master
+        imagePullPolicy: Always
         name: octopus
         volumeMounts:
         - mountPath: /var/lib/octopus/adaptors/

diff --git a/adaptors/opcua/deploy/manifests/workload/daemonset.yaml b/adaptors/opcua/deploy/manifests/workload/daemonset.yaml
@@ -21,6 +21,7 @@ spec:
       containers:
         - name: octopus
           image: cnrancher/octopus-adaptor-opcua:master
+          imagePullPolicy: Always
           volumeMounts:
             - mountPath: /var/lib/octopus/adaptors/
               name: sockets

diff --git a/template/adaptor/deploy/e2e/all_in_one.yaml b/template/adaptor/deploy/e2e/all_in_one.yaml
@@ -2,7 +2,6 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.5
     devices.edge.cattle.io/description: ""
     devices.edge.cattle.io/device-property: '{"name":"string","dataType":"string","value":"string","updatedAt":"date"}'
     devices.edge.cattle.io/enable: "true"
@@ -128,6 +127,7 @@ spec:
     spec:
       containers:
       - image: cnrancher/octopus-adaptor-template:master
+        imagePullPolicy: Always
         name: octopus
         volumeMounts:
         - mountPath: /var/lib/octopus/adaptors/

diff --git a/template/adaptor/deploy/manifests/crd/base/devices.edge.cattle.io_templatedevices.yaml b/template/adaptor/deploy/manifests/crd/base/devices.edge.cattle.io_templatedevices.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    controller-gen.kubebuilder.io/version: v0.2.5
+    {}
   creationTimestamp: null
   name: templatedevices.devices.edge.cattle.io
 spec:

diff --git a/template/adaptor/deploy/manifests/workload/daemonset.yaml b/template/adaptor/deploy/manifests/workload/daemonset.yaml
@@ -19,6 +19,7 @@ spec:
       containers:
         - name: octopus
           image: cnrancher/octopus-adaptor-template:master
+          imagePullPolicy: Always
           volumeMounts:
             - mountPath: /var/lib/octopus/adaptors/
               name: sockets