X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fregistry%2Ftemplates%2Fmain%2Fdocker-registry.yml;h=2c980886e8676d8bab00c8bce2b098f5e9aba473;hb=85d00249cd7fd51320c736851b40844bb54fbd3c;hp=e81d44e28bd477a4d741f9fc54a0d1c3f7b789db;hpb=2ed671c54dad28dd81763928b28cd17d5c76df66;p=ta%2Fcaas-registry.git

diff --git a/ansible/roles/registry/templates/main/docker-registry.yml b/ansible/roles/registry/templates/main/docker-registry.yml
index e81d44e..2c98088 100644
--- a/ansible/roles/registry/templates/main/docker-registry.yml
+++ b/ansible/roles/registry/templates/main/docker-registry.yml
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 #}
 ---
-apiVersion: apps/v1beta2
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: registry
@@ -25,19 +25,18 @@ spec:
       name: registry
   template:
     metadata:
-      annotations:
-        danm.k8s.io/interfaces: |
-          [
-            {
-              "network":"flannel"
-            }
-          ]
       labels:
         name: registry
     spec:
+      priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
         nodetype: caas_master
+      tolerations:
+      - key: "node-maintenancemode"
+        value: "enabled"
+        operator: "Equal"
+        effect: "NoExecute"
       securityContext:
         runAsUser: {{ caas.uid.dockerreg }}
       containers:
@@ -50,7 +49,13 @@ spec:
               value: "{{ caas.registry_port }}"
             - name: REGISTRY_CONFIG
               value: /etc/docker-registry/docker-registry-main-config.yml
+          resources:
+            requests:
+              cpu: "10m"
           volumeMounts:
+            - name: time-mount
+              mountPath: /etc/localtime
+              readOnly: true
             - name: config
               mountPath: /etc/docker-registry/
               readOnly: true
@@ -60,6 +65,9 @@ spec:
               mountPath: /etc/ssl/certs/
               readOnly: true
       volumes:
+        - name: time-mount
+          hostPath:
+            path: /etc/localtime
         - name: config
           hostPath:
             path: /etc/docker-registry/