Merge "Update kubernetes config for 1.15 features."
This commit is contained in:
commit
38438e2709
|
@ -10896,7 +10896,7 @@ itemNotFound (404)
|
||||||
"registry_images": [
|
"registry_images": [
|
||||||
{
|
{
|
||||||
"tag": null,
|
"tag": null,
|
||||||
"name": "docker.io/port/ceph-config-helper"
|
"name": "docker.io/starlingx/ceph-config-helper"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"tag": null,
|
"tag": null,
|
||||||
|
@ -10946,8 +10946,8 @@ itemNotFound (404)
|
||||||
{
|
{
|
||||||
"registry_images": [
|
"registry_images": [
|
||||||
{
|
{
|
||||||
"tag": "v1.10.3",
|
"tag": "v1.15.0",
|
||||||
"name": "docker.io/port/ceph-config-helper"
|
"name": "docker.io/starlingx/ceph-config-helper"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,8 @@
|
||||||
SRC_DIR="stx-openstack-helm"
|
SRC_DIR="stx-openstack-helm"
|
||||||
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/garbd \
|
COPY_LIST_TO_TAR="$PKG_BASE/../../../helm-charts/garbd \
|
||||||
$PKG_BASE/../../../helm-charts/nginx-ports-control"
|
$PKG_BASE/../../../helm-charts/nginx-ports-control"
|
||||||
|
|
||||||
# This version is used as a component of the stx-openstack application
|
# This version is used as a component of the stx-openstack application
|
||||||
# version. Any change to this version must also be reflected in the
|
# version. Any change to this version must also be reflected in the
|
||||||
# SUPPORTED_VERSIONS list in sysinv/helm/openstack_version_check.py
|
# SUPPORTED_VERSIONS list in sysinv/helm/openstack_version_check.py
|
||||||
#
|
#
|
||||||
TIS_PATCH_VER=17
|
TIS_PATCH_VER=18
|
||||||
|
|
|
@ -556,6 +556,8 @@ data:
|
||||||
ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
|
rgw_s3_admin: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
|
ceph_config_helper: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
labels:
|
labels:
|
||||||
api:
|
api:
|
||||||
node_selector_key: openstack-control-plane
|
node_selector_key: openstack-control-plane
|
||||||
|
@ -628,6 +630,7 @@ data:
|
||||||
glance_api: docker.io/starlingx/stx-glance:master-centos-stable-latest
|
glance_api: docker.io/starlingx/stx-glance:master-centos-stable-latest
|
||||||
glance_db_sync: docker.io/starlingx/stx-glance:master-centos-stable-latest
|
glance_db_sync: docker.io/starlingx/stx-glance:master-centos-stable-latest
|
||||||
glance_registry: docker.io/starlingx/stx-glance:master-centos-stable-latest
|
glance_registry: docker.io/starlingx/stx-glance:master-centos-stable-latest
|
||||||
|
glance_storage_init: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
|
@ -696,8 +699,10 @@ data:
|
||||||
bootstrap: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
bootstrap: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
cinder_api: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
cinder_api: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
||||||
cinder_backup: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
cinder_backup: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
||||||
|
cinder_backup_storage_init: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
cinder_db_sync: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
cinder_db_sync: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
||||||
cinder_scheduler: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
cinder_scheduler: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
||||||
|
cinder_storage_init: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
cinder_volume: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
cinder_volume: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
||||||
cinder_volume_usage_audit: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
cinder_volume_usage_audit: docker.io/starlingx/stx-cinder:master-centos-stable-latest
|
||||||
db_drop: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
db_drop: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
|
@ -901,8 +906,10 @@ data:
|
||||||
nova_novncproxy: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
nova_novncproxy: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
||||||
nova_placement: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
nova_placement: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
||||||
nova_scheduler: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
nova_scheduler: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
||||||
|
nova_service_cleaner: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
nova_spiceproxy: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
nova_spiceproxy: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
||||||
nova_spiceproxy_assets: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
nova_spiceproxy_assets: docker.io/starlingx/stx-nova:master-centos-stable-latest
|
||||||
|
nova_storage_init: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
pod:
|
pod:
|
||||||
# TODO(rchurch):
|
# TODO(rchurch):
|
||||||
# Change-Id: I5a60efd133c156ce2ecac31d22e94b25e4e837bf broke armada apply
|
# Change-Id: I5a60efd133c156ce2ecac31d22e94b25e4e837bf broke armada apply
|
||||||
|
@ -1622,6 +1629,7 @@ data:
|
||||||
gnocchi_metricd: docker.io/starlingx/stx-gnocchi:master-centos-stable-latest
|
gnocchi_metricd: docker.io/starlingx/stx-gnocchi:master-centos-stable-latest
|
||||||
gnocchi_resources_cleaner: docker.io/starlingx/stx-gnocchi:master-centos-stable-latest
|
gnocchi_resources_cleaner: docker.io/starlingx/stx-gnocchi:master-centos-stable-latest
|
||||||
gnocchi_statsd: docker.io/starlingx/stx-gnocchi:master-centos-stable-latest
|
gnocchi_statsd: docker.io/starlingx/stx-gnocchi:master-centos-stable-latest
|
||||||
|
gnocchi_storage_init: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
ks_endpoints: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
ks_service: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
ks_user: docker.io/starlingx/stx-heat:master-centos-stable-latest
|
||||||
|
|
|
@ -26,7 +26,7 @@ conf:
|
||||||
|
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
ceph_config_helper: docker.io/port/ceph-config-helper:v1.10.3
|
ceph_config_helper: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
pullPolicy: "IfNotPresent"
|
pullPolicy: "IfNotPresent"
|
||||||
local_registry:
|
local_registry:
|
||||||
active: false
|
active: false
|
||||||
|
|
|
@ -165,7 +165,7 @@ ephemeral_pools:
|
||||||
images:
|
images:
|
||||||
tags:
|
tags:
|
||||||
rbd_provisioner: quay.io/external_storage/rbd-provisioner:v2.1.1-k8s1.11
|
rbd_provisioner: quay.io/external_storage/rbd-provisioner:v2.1.1-k8s1.11
|
||||||
rbd_provisioner_storage_init: docker.io/port/ceph-config-helper:v1.10.3
|
rbd_provisioner_storage_init: docker.io/starlingx/ceph-config-helper:v1.15.0
|
||||||
pull_policy: "IfNotPresent"
|
pull_policy: "IfNotPresent"
|
||||||
local_registry:
|
local_registry:
|
||||||
active: false
|
active: false
|
||||||
|
|
|
@ -24,7 +24,7 @@ class platform::kubernetes::params (
|
||||||
class platform::kubernetes::cgroup::params (
|
class platform::kubernetes::cgroup::params (
|
||||||
$cgroup_root = '/sys/fs/cgroup',
|
$cgroup_root = '/sys/fs/cgroup',
|
||||||
$cgroup_name = 'k8s-infra',
|
$cgroup_name = 'k8s-infra',
|
||||||
$controllers = ['cpuset', 'cpu', 'cpuacct', 'memory', 'systemd'],
|
$controllers = ['cpuset', 'cpu', 'cpuacct', 'memory', 'systemd', 'pids'],
|
||||||
) {}
|
) {}
|
||||||
|
|
||||||
class platform::kubernetes::cgroup
|
class platform::kubernetes::cgroup
|
||||||
|
@ -48,7 +48,7 @@ class platform::kubernetes::cgroup
|
||||||
# NOTE: The kubernetes cgroup_manager_linux func Exists() checks that
|
# NOTE: The kubernetes cgroup_manager_linux func Exists() checks that
|
||||||
# specific subsystem cgroup paths actually exist on the system. The
|
# specific subsystem cgroup paths actually exist on the system. The
|
||||||
# particular cgroup cgroupRoot must exist for the following controllers:
|
# particular cgroup cgroupRoot must exist for the following controllers:
|
||||||
# "cpu", "cpuacct", "cpuset", "memory", "systemd".
|
# "cpu", "cpuacct", "cpuset", "memory", "systemd", "pids".
|
||||||
# Reference:
|
# Reference:
|
||||||
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/cm/cgroup_manager_linux.go
|
# https://github.com/kubernetes/kubernetes/blob/master/pkg/kubelet/cm/cgroup_manager_linux.go
|
||||||
# systemd automatically mounts cgroups and controllers, so don't need
|
# systemd automatically mounts cgroups and controllers, so don't need
|
||||||
|
|
|
@ -1,11 +1,10 @@
|
||||||
apiVersion: kubeadm.k8s.io/v1alpha3
|
apiVersion: kubeadm.k8s.io/v1beta2
|
||||||
kind: InitConfiguration
|
kind: InitConfiguration
|
||||||
apiEndpoint:
|
localAPIEndpoint:
|
||||||
advertiseAddress: <%= @apiserver_advertise_address %>
|
advertiseAddress: <%= @apiserver_advertise_address %>
|
||||||
---
|
---
|
||||||
apiVersion: kubeadm.k8s.io/v1beta1
|
apiVersion: kubeadm.k8s.io/v1beta2
|
||||||
kind: ClusterConfiguration
|
kind: ClusterConfiguration
|
||||||
kubernetesVersion: 1.13.5
|
|
||||||
|
|
||||||
apiServer:
|
apiServer:
|
||||||
certSANs:
|
certSANs:
|
||||||
|
@ -29,6 +28,7 @@ etcd:
|
||||||
endpoints:
|
endpoints:
|
||||||
- <%= @etcd_endpoint %>
|
- <%= @etcd_endpoint %>
|
||||||
imageRepository: "<%= @k8s_registry %>"
|
imageRepository: "<%= @k8s_registry %>"
|
||||||
|
kubernetesVersion: v1.15.3
|
||||||
networking:
|
networking:
|
||||||
dnsDomain: <%= @service_domain %>
|
dnsDomain: <%= @service_domain %>
|
||||||
podSubnet: <%= @pod_network_cidr %>
|
podSubnet: <%= @pod_network_cidr %>
|
||||||
|
@ -36,9 +36,6 @@ networking:
|
||||||
---
|
---
|
||||||
kind: KubeletConfiguration
|
kind: KubeletConfiguration
|
||||||
apiVersion: kubelet.config.k8s.io/v1beta1
|
apiVersion: kubelet.config.k8s.io/v1beta1
|
||||||
# Workaround for the following issue:
|
|
||||||
# https://github.com/kubernetes/kubernetes/issues/74412
|
|
||||||
configMapAndSecretChangeDetectionStrategy: Cache
|
|
||||||
nodeStatusUpdateFrequency: "4s"
|
nodeStatusUpdateFrequency: "4s"
|
||||||
failSwapOn: false
|
failSwapOn: false
|
||||||
cgroupRoot: "/k8s-infra"
|
cgroupRoot: "/k8s-infra"
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
from sysinv.helm import base
|
from sysinv.helm import base
|
||||||
|
|
||||||
SUPPORTED_VERSIONS = {
|
SUPPORTED_VERSIONS = {
|
||||||
'1.0-17-centos-stable-versioned',
|
'1.0-18-centos-stable-versioned',
|
||||||
'1.0-17-centos-stable-latest',
|
'1.0-18-centos-stable-latest',
|
||||||
'1.0-17',
|
'1.0-18',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue