X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=ansible%2Froles%2Fregistry%2Ftemplates%2Fmain%2Fdocker-registry.yml;h=4dced7753f4494ec4e5a0416865fe8ab4e7ce377;hb=0825e1b5ce83021b3d6936ed51f7c5a6c63642ff;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..4dced77 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,16 +25,10 @@ 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 @@ -50,7 +44,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 +60,9 @@ spec: mountPath: /etc/ssl/certs/ readOnly: true volumes: + - name: time-mount + hostPath: + path: /etc/localtime - name: config hostPath: path: /etc/docker-registry/