From 511ecbc0fb87bf0d5fa9a99f1555b413cdc0c37a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= Date: Wed, 31 Jul 2019 17:25:11 +0200 Subject: [PATCH] update the inventory --- integr8ly | 2 +- openshift-ansible | 2 +- prod.hosts | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/integr8ly b/integr8ly index 94c152c..b8966d0 160000 --- a/integr8ly +++ b/integr8ly @@ -1 +1 @@ -Subproject commit 94c152c742fcef81100f2b2c0b41775f7691ccbe +Subproject commit b8966d010d7ec41a8428c5c2669d78cdf973034f diff --git a/openshift-ansible b/openshift-ansible index af96f82..764a52d 160000 --- a/openshift-ansible +++ b/openshift-ansible @@ -1 +1 @@ -Subproject commit af96f82881eb95231e1a9fc7db06d9d031963b1d +Subproject commit 764a52d30a9eb8fa48bb13758a90debe4d0db111 diff --git a/prod.hosts b/prod.hosts index 93d75be..0159ddb 100644 --- a/prod.hosts +++ b/prod.hosts @@ -84,12 +84,14 @@ openshift_disable_check=docker_image_availability # Inject the MAVEN_MIRROR_URL in all builds openshift_builddefaults_json='{"BuildDefaults":{"configuration":{"apiVersion":"v1","env":[{"name":"MAVEN_MIRROR_URL","value":"http://nexus.factory.svc.cluster.local:8081/repository/maven-all-public/"}],"kind":"BuildDefaultsConfig"}}}' -# Raise the pod-per-core and max-pods limits -openshift_node_kubelet_args='{"pods-per-core":["40"]}' - # Set the NodePort range for Bittorrent use openshift_node_port_range="6881-6999" # Integr8ly webapp in dev mode osm_custom_cors_origins=['http://localhost:3006'] +# See #2: Raise the pods-per-core limit +openshift_node_groups=[ {"name": "node-config-all-in-one", "labels": [ "node-role.kubernetes.io/master=true", "node-role.kubernetes.io/infra=true", "node-role.kubernetes.io/compute=true" ], "edits": [ { "key": "kubeletArguments.pods-per-core", "value": [ "40" ] }, { "key": "kubeletArguments.max-pods", "value": [ "250" ] } ] } ] + +# Do not fail when certificates are about to expire on the platform +openshift_certificate_expiry_fail_on_warn=no