From 86890efc056b21bdd1034aa24edf310da7d462f9 Mon Sep 17 00:00:00 2001 From: Krisztian Lengyel Date: Tue, 8 Oct 2019 15:18:01 +0200 Subject: [PATCH] Schedule pods by nodetype Change-Id: If4b5b4e9195ad26abec8e54dc2b518b36454c380 Signed-off-by: Krisztian Lengyel --- SPECS/registry.spec | 2 +- SPECS/swift.spec | 2 +- ansible/roles/registry/templates/update/docker-registry-update.yml | 2 +- ansible/roles/swift/templates/update/swift_update.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SPECS/registry.spec b/SPECS/registry.spec index 56a414c..0e788ef 100644 --- a/SPECS/registry.spec +++ b/SPECS/registry.spec @@ -15,7 +15,7 @@ %define COMPONENT registry %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 2.7.1 -%define RPM_MINOR_VERSION 10 +%define RPM_MINOR_VERSION 11 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} %define go_version 1.12.10 diff --git a/SPECS/swift.spec b/SPECS/swift.spec index f1d2112..20cc79b 100644 --- a/SPECS/swift.spec +++ b/SPECS/swift.spec @@ -15,7 +15,7 @@ %define COMPONENT swift %define RPM_NAME caas-%{COMPONENT} %define RPM_MAJOR_VERSION 2.22.0 -%define RPM_MINOR_VERSION 3 +%define RPM_MINOR_VERSION 4 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION} %define centos_build 191001 Name: %{RPM_NAME} diff --git a/ansible/roles/registry/templates/update/docker-registry-update.yml b/ansible/roles/registry/templates/update/docker-registry-update.yml index 653b938..3df440b 100644 --- a/ansible/roles/registry/templates/update/docker-registry-update.yml +++ b/ansible/roles/registry/templates/update/docker-registry-update.yml @@ -31,7 +31,7 @@ spec: priorityClassName: "system-cluster-critical" dnsPolicy: ClusterFirst nodeSelector: - nodename: caas_master1 + nodetype: caas_master securityContext: runAsUser: {{ caas.uid.dockerreg }} containers: diff --git a/ansible/roles/swift/templates/update/swift_update.yml b/ansible/roles/swift/templates/update/swift_update.yml index 8910bcc..1533625 100644 --- a/ansible/roles/swift/templates/update/swift_update.yml +++ b/ansible/roles/swift/templates/update/swift_update.yml @@ -32,7 +32,7 @@ spec: hostNetwork: true dnsPolicy: ClusterFirstWithHostNet nodeSelector: - nodename: caas_master1 + nodetype: caas_master securityContext: runAsUser: {{ caas.uid.swift }} containers: -- 2.16.6