Code Review
/
ta
/
caas-registry.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add maintenance toleration for caas-registry
[ta/caas-registry.git]
/
ansible
/
roles
/
registry
/
templates
/
main
/
docker-registry.yml
diff --git
a/ansible/roles/registry/templates/main/docker-registry.yml
b/ansible/roles/registry/templates/main/docker-registry.yml
index
3711d11
..
2c98088
100644
(file)
--- 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.
#}
---
limitations under the License.
#}
---
-apiVersion: apps/v1
beta2
+apiVersion: apps/v1
kind: DaemonSet
metadata:
name: registry
kind: DaemonSet
metadata:
name: registry
@@
-25,19
+25,18
@@
spec:
name: registry
template:
metadata:
name: registry
template:
metadata:
- annotations:
- danm.k8s.io/interfaces: |
- [
- {
- "network":"flannel"
- }
- ]
labels:
name: registry
spec:
labels:
name: registry
spec:
+ priorityClassName: "system-cluster-critical"
dnsPolicy: ClusterFirst
nodeSelector:
nodetype: caas_master
dnsPolicy: ClusterFirst
nodeSelector:
nodetype: caas_master
+ tolerations:
+ - key: "node-maintenancemode"
+ value: "enabled"
+ operator: "Equal"
+ effect: "NoExecute"
securityContext:
runAsUser: {{ caas.uid.dockerreg }}
containers:
securityContext:
runAsUser: {{ caas.uid.dockerreg }}
containers:
@@
-50,6
+49,9
@@
spec:
value: "{{ caas.registry_port }}"
- name: REGISTRY_CONFIG
value: /etc/docker-registry/docker-registry-main-config.yml
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
volumeMounts:
- name: time-mount
mountPath: /etc/localtime