Manifest update

Cpu request setted to registry and swift.
Critical pods flag added.
Minor version bump.

Change-Id: I18b6bfdbe20e1d42306de16fac9cd2e7bb75b683
Signed-off-by: Szekeres, Balazs (Nokia - HU/Budapest) <balazs.szekeres@nokia.com>

diff --git a/SPECS/registry.spec b/SPECS/registry.spec
index e3ec502..b8247a7 100644 (file)
--- 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 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}

diff --git a/SPECS/swift.spec b/SPECS/swift.spec
index e110240..8327d54 100644 (file)
--- 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.21.0
-%define RPM_MINOR_VERSION 1
+%define RPM_MINOR_VERSION 2
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}

diff --git a/ansible/roles/registry/templates/main/docker-registry.yml b/ansible/roles/registry/templates/main/docker-registry.yml
index 3711d11..3bb725a 100644 (file)
--- a/ansible/roles/registry/templates/main/docker-registry.yml
+++ b/ansible/roles/registry/templates/main/docker-registry.yml
@@ -35,6 +35,7 @@ spec:
       labels:
         name: registry
     spec:
+      priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
         nodetype: caas_master
@@ -50,6 +51,9 @@ 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

diff --git a/ansible/roles/registry/templates/update/docker-registry-update.yml b/ansible/roles/registry/templates/update/docker-registry-update.yml
index 483d6e9..89b2387 100644 (file)
--- a/ansible/roles/registry/templates/update/docker-registry-update.yml
+++ b/ansible/roles/registry/templates/update/docker-registry-update.yml
@@ -35,6 +35,7 @@ spec:
       labels:
         name: registry-update
     spec:
+      priorityClassName: "system-cluster-critical"
       dnsPolicy: ClusterFirst
       nodeSelector:
         nodename: caas_master1
@@ -50,6 +51,9 @@ spec:
               value: "{{ caas.update_registry_port }}"
             - name: REGISTRY_CONFIG
               value: /etc/docker-registry/docker-registry-update-config.yml
+          resources:
+            requests:
+              cpu: "10m"
           volumeMounts:
             - name: time-mount
               mountPath: /etc/localtime

diff --git a/ansible/roles/swift/templates/main/swift_main.yml b/ansible/roles/swift/templates/main/swift_main.yml
index 1b752df..f2c1327 100644 (file)
--- a/ansible/roles/swift/templates/main/swift_main.yml
+++ b/ansible/roles/swift/templates/main/swift_main.yml
@@ -28,6 +28,7 @@ spec:
       labels:
         name: swift
     spec:
+      priorityClassName: "system-cluster-critical"
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
       nodeSelector:
@@ -44,8 +45,10 @@ spec:
             - BACKEND
           resources:
             limits:
+              cpu: "1"
               memory: "4Gi"
             requests:
+              cpu: "200m"
               memory: "1Gi"
           env:
             - name: "SWIFT_USER"

diff --git a/ansible/roles/swift/templates/update/swift_update.yml b/ansible/roles/swift/templates/update/swift_update.yml
index 38435aa..cffc531 100644 (file)
--- a/ansible/roles/swift/templates/update/swift_update.yml
+++ b/ansible/roles/swift/templates/update/swift_update.yml
@@ -28,6 +28,7 @@ spec:
       labels:
         name: swift-update
     spec:
+      priorityClassName: "system-cluster-critical"
       hostNetwork: true
       dnsPolicy: ClusterFirstWithHostNet
       nodeSelector:
@@ -46,6 +47,7 @@ spec:
             limits:
               memory: "4Gi"
             requests:
+              cpu: "200m"
               memory: "1Gi"
           env:
             - name: "SWIFT_PART_POWER"