Alexandros Kosiaris has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329592 )
Change subject: Specify kubernetes admission controllers via hiera
......................................................................
Specify kubernetes admission controllers via hiera
We want to not use the default admission controllers specified in
k8s::apiserver. Specifically we want to avoid using for now the
UidEnforcer and HostAutomounter and HostPathEnforcer controllers. We
also want to conform to the 1.4 recommended controllers and add
DefaultStorageClass for production. Not adding ServiceAccount
controller yet though
Change-Id: I659e8c1d862603a6eeb14face62e4c5a0786bba2
---
M hieradata/role/common/kubernetes/master.yaml
M modules/k8s/manifests/apiserver.pp
M modules/profile/manifests/kubernetes/master.pp
3 files changed, 9 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/hieradata/role/common/kubernetes/master.yaml
b/hieradata/role/common/kubernetes/master.yaml
index 8ec7608..2cb108a 100644
--- a/hieradata/role/common/kubernetes/master.yaml
+++ b/hieradata/role/common/kubernetes/master.yaml
@@ -14,3 +14,9 @@
- kubernetes1004.eqiad.wmnet
profile::kubernetes::master::service_cluster_ip_range: 192.168.30.0/24
profile::kubernetes::master::apiserver_count: 2
+profile::kubernetes::master::admission_controllers:
+ - NamespaceLifecycle
+ - ResourceQuota
+ - LimitRanger
+ - RegistryEnforcer
+ - DefaultStorageClass
diff --git a/modules/k8s/manifests/apiserver.pp
b/modules/k8s/manifests/apiserver.pp
index 8def3e0..bf90255 100644
--- a/modules/k8s/manifests/apiserver.pp
+++ b/modules/k8s/manifests/apiserver.pp
@@ -73,6 +73,7 @@
group => 'root',
mode => '0444',
content => template('k8s/kube-apiserver.default.erb'),
+ notify => Service['kube-apiserver'],
}
base::service_unit { 'kube-apiserver':
diff --git a/modules/profile/manifests/kubernetes/master.pp
b/modules/profile/manifests/kubernetes/master.pp
index bfc5f56..beaa41b 100644
--- a/modules/profile/manifests/kubernetes/master.pp
+++ b/modules/profile/manifests/kubernetes/master.pp
@@ -4,6 +4,7 @@
$docker_registry=hiera('profile::kubernetes::master::docker_registry'),
$service_cluster_ip_range=hiera('profile::kubernetes::master::service_cluster_ip_range'),
$apiserver_count=hiera('profile::kubernetes::master::apiserver_count'),
+
$admission_controllers=hiera('profile::kubernetes::master::admission_controllers'),
){
base::expose_puppet_certs { '/etc/kubernetes':
provide_private => true,
@@ -21,6 +22,7 @@
authz_mode => '',
service_cluster_ip_range => $service_cluster_ip_range,
apiserver_count => $apiserver_count,
+ admission_controllers => $admission_controllers,
}
class { '::k8s::scheduler': use_package => true }
--
To view, visit https://gerrit.wikimedia.org/r/329592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I659e8c1d862603a6eeb14face62e4c5a0786bba2
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits