Skip to content

Commit

Permalink
Move parameter definition back to head of init.pp (fixes #169) (#193)
Browse files Browse the repository at this point in the history
  • Loading branch information
@temujin9 @davejrt
temujin9 authored and davejrt committed Nov 17, 2018
1 parent 7fb46f2 commit ab051e8
Show file tree
Hide file tree
Showing 4 changed files with 79 additions and 155 deletions.
146 changes: 79 additions & 67 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -291,74 +291,86 @@
#
#
class kubernetes (
String $kubernetes_version = $kubernetes::params::kubernetes_version,
String $kubernetes_package_version = $kubernetes::params::kubernetes_package_version,
String $container_runtime = $kubernetes::params::container_runtime,
Optional[String] $containerd_version = $kubernetes::params::containerd_version,
Optional[String] $docker_package_name = $kubernetes::params::docker_package_name,
Optional[String] $docker_version = $kubernetes::params::docker_version,
Optional[String] $cni_pod_cidr = $kubernetes::params::cni_pod_cidr,
Boolean $controller = $kubernetes::params::controller,
Boolean $worker = $kubernetes::params::worker,
Boolean $manage_docker = $kubernetes::params::manage_docker,
Boolean $manage_etcd = $kubernetes::params::manage_etcd,
Optional[String] $kube_api_advertise_address = $kubernetes::params::kube_api_advertise_address,
Optional[String] $etcd_version = $kubernetes::params::etcd_version,
Optional[String] $etcd_ip = $kubernetes::params::etcd_ip,
Optional[Array] $etcd_peers = $kubernetes::params::etcd_peers,
Optional[String] $etcd_initial_cluster = $kubernetes::params::etcd_initial_cluster,
String $etcd_ca_key = $kubernetes::params::etcd_ca_key,
String $etcd_ca_crt = $kubernetes::params::etcd_ca_crt,
String $etcdclient_key = $kubernetes::params::etcdclient_key,
String $etcdclient_crt = $kubernetes::params::etcdclient_crt,
Optional[String] $etcdserver_crt = $kubernetes::params::etcdserver_crt,
Optional[String] $etcdserver_key = $kubernetes::params::etcdserver_key,
Optional[String] $etcdpeer_crt = $kubernetes::params::etcdpeer_crt,
Optional[String] $etcdpeer_key = $kubernetes::params::etcdpeer_key,
Optional[String] $cni_network_provider = $kubernetes::params::cni_network_provider,
Optional[String] $cni_rbac_binding = $kubernetes::params::cni_rbac_binding,
Boolean $install_dashboard = $kubernetes::params::install_dashboard,
Boolean $schedule_on_controller = $kubernetes::params::schedule_on_controller,
Integer $api_server_count = $kubernetes::params::api_server_count,
String $kubernetes_ca_crt = $kubernetes::params::kubernetes_ca_crt,
String $kubernetes_ca_key = $kubernetes::params::kubernetes_ca_key,
String $token = $kubernetes::params::token,
String $discovery_token_hash = $kubernetes::params::discovery_token_hash,
String $sa_pub = $kubernetes::params::sa_pub,
String $sa_key = $kubernetes::params::sa_key,
Optional[Array] $apiserver_cert_extra_sans = $kubernetes::params::apiserver_cert_extra_sans,
Optional[Array] $apiserver_extra_arguments = $kubernetes::params::apiserver_extra_arguments,
String $service_cidr = $kubernetes::params::service_cidr,
String $node_label = $kubernetes::params::node_label,
Optional[String] $controller_address = $kubernetes::params::controller_address,
Optional[String] $cloud_provider = $kubernetes::params::cloud_provider,
Optional[String] $cloud_config = $kubernetes::params::cloud_config,
Optional[Hash] $kubeadm_extra_config = $kubernetes::params::kubeadm_extra_config,
Optional[Hash] $kubelet_extra_config = $kubernetes::params::kubelet_extra_config,
Optional[String] $runc_source = $kubernetes::params::runc_source,
Optional[String] $containerd_archive = $kubernetes::params::containerd_archive,
Optional[String] $containerd_source = $kubernetes::params::containerd_source,
String $etcd_archive = $kubernetes::params::etcd_archive,
String $etcd_source = $kubernetes::params::etcd_source,
Optional[String] $kubernetes_apt_location = $kubernetes::params::kubernetes_apt_location,
Optional[String] $kubernetes_apt_release = $kubernetes::params::kubernetes_apt_release,
Optional[String] $kubernetes_apt_repos = $kubernetes::params::kubernetes_apt_repos,
Optional[String] $kubernetes_key_id = $kubernetes::params::kubernetes_key_id,
Optional[String] $kubernetes_key_source = $kubernetes::params::kubernetes_key_source,
Optional[String] $kubernetes_yum_baseurl = $kubernetes::params::kubernetes_yum_baseurl,
Optional[String] $kubernetes_yum_gpgkey = $kubernetes::params::kubernetes_yum_gpgkey,
Optional[String] $docker_apt_location = $kubernetes::params::docker_apt_location,
Optional[String] $docker_apt_release = $kubernetes::params::docker_apt_release,
Optional[String] $docker_apt_repos = $kubernetes::params::docker_apt_repos,
Optional[String] $docker_yum_baseurl = $kubernetes::params::docker_yum_baseurl,
Optional[String] $docker_yum_gpgkey = $kubernetes::params::docker_yum_gpgkey,
Optional[String] $docker_key_id = $kubernetes::params::docker_key_id,
Optional[String] $docker_key_source = $kubernetes::params::docker_key_source,
Boolean $disable_swap = $kubernetes::params::disable_swap,
Boolean $create_repos = $kubernetes::params::create_repos,
String $image_repository = $kubernetes::params::image_repository,
String $kubernetes_version = '1.10.2',
String $kubernetes_package_version = $::osfamily ? {
'Debian' => "${kubernetes_version}-00",
'RedHat' => $kubernetes::kubernetes_version,
},
String $container_runtime = 'docker',
Optional[String] $containerd_version = '1.1.0',
Optional[String] $docker_package_name = 'docker-engine',
Optional[String] $docker_version = $::osfamily ? {
'Debian' => '17.03.0~ce-0~ubuntu-xenial',
'RedHat' => '17.03.1.ce-1.el7.centos',
},
Optional[String] $cni_pod_cidr = undef,
Boolean $controller = false,
Boolean $worker = false,
Boolean $manage_docker = true,
Boolean $manage_etcd = true,
Optional[String] $kube_api_advertise_address = undef,
Optional[String] $etcd_version = '3.1.12',
Optional[String] $etcd_ip = undef,
Optional[Array] $etcd_peers = undef,
Optional[String] $etcd_initial_cluster = undef,
String $etcd_ca_key = undef,
String $etcd_ca_crt = undef,
String $etcdclient_key = undef,
String $etcdclient_crt = undef,
Optional[String] $etcdserver_crt = undef,
Optional[String] $etcdserver_key = undef,
Optional[String] $etcdpeer_crt = undef,
Optional[String] $etcdpeer_key = undef,
Optional[String] $cni_network_provider = undef,
Optional[String] $cni_rbac_binding = undef,
Boolean $install_dashboard = false,
Boolean $schedule_on_controller = false,
Integer $api_server_count = undef,
String $kubernetes_ca_crt = undef,
String $kubernetes_ca_key = undef,
String $token = undef,
String $discovery_token_hash = undef,
String $sa_pub = undef,
String $sa_key = undef,
Optional[Array] $apiserver_cert_extra_sans = [],
Optional[Array] $apiserver_extra_arguments = [],
String $service_cidr = '10.96.0.0/12',
String $node_label = $::hostname,
Optional[String] $controller_address = undef,
Optional[String] $cloud_provider = undef,
Optional[String] $cloud_config = undef,
Optional[Hash] $kubeadm_extra_config = undef,
Optional[Hash] $kubelet_extra_config = undef,
Optional[String] $runc_version = '1.0.0-rc5',
Optional[String] $runc_source =
"https://github.com/opencontainers/runc/releases/download/v${runc_version}/runc.amd64",
Optional[String] $containerd_archive = "containerd-${containerd_version}.linux-amd64.tar.gz",
Optional[String] $containerd_source =
"https://github.com/containerd/containerd/releases/download/v${containerd_version}/${containerd_archive}",
String $etcd_archive = "etcd-v${etcd_version}-linux-amd64.tar.gz",
String $etcd_source = "https://github.com/coreos/etcd/releases/download/v${etcd_version}/${etcd_archive}",
Optional[String] $kubernetes_apt_location = 'http://apt.kubernetes.io',
Optional[String] $kubernetes_apt_release = "kubernetes-${::lsbdistcodename}",
Optional[String] $kubernetes_apt_repos = 'main',
Optional[String] $kubernetes_key_id = '54A647F9048D5688D7DA2ABE6A030B21BA07F4FB',
Optional[String] $kubernetes_key_source = 'https://packages.cloud.google.com/apt/doc/apt-key.gpg',
Optional[String] $kubernetes_yum_baseurl = 'https://packages.cloud.google.com/yum/repos/kubernetes-el7-x86_64',
Optional[String] $kubernetes_yum_gpgkey = 'https://packages.cloud.google.com/yum/doc/rpm-package-key.gpg',
Optional[String] $docker_apt_location = 'https://apt.dockerproject.org/repo',
Optional[String] $docker_apt_release = "ubuntu-${::lsbdistcodename}",
Optional[String] $docker_apt_repos = 'main',
Optional[String] $docker_yum_baseurl = 'https://yum.dockerproject.org/repo/main/centos/7',
Optional[String] $docker_yum_gpgkey = 'https://yum.dockerproject.org/gpg',
Optional[String] $docker_key_id = '58118E89F3A912897C070ADBF76221572C52609D',
Optional[String] $docker_key_source = 'https://apt.dockerproject.org/gpg',
Boolean $disable_swap = true,
Boolean $create_repos = true,
String $image_repository = 'k8s.gcr.io',
){

) inherits kubernetes::params {
if ! $::osfamily in ['Debian','RedHat'] {
notify {"The OS family ${::osfamily} is not supported by this module":}
}

if $controller {
if $worker {
Expand Down
2 changes: 0 additions & 2 deletions manifests/kubeadm_init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@
Optional[String] $token_ttl = undef,
) {

include kubernetes::params

$kubeadm_init_flags = kubeadm_init_flags({
apiserver_advertise_address => $apiserver_advertise_address,
apiserver_bind_port => $apiserver_bind_port,
Expand Down
2 changes: 0 additions & 2 deletions manifests/kubeadm_join.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@
Optional[String] $token = undef
) {

include kubernetes::params

$kubeadm_join_flags = kubeadm_join_flags({
controller_address => $controller_address,
config => $config,
Expand Down
84 changes: 0 additions & 84 deletions manifests/params.pp
View file

This file was deleted.

0 comments on commit ab051e8

Please sign in to comment.