Merge pull request #19 from rwaffen/patching

add some patches to get this working
voxpupuli · Mar 6, 2023 · 45886d4 · 45886d4
2 parents 5674235 + 12a437d
commit 45886d4
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/REFERENCE.md b/REFERENCE.md
@@ -79,6 +79,7 @@ The following parameters are available in the `k8s` class:
 * [`container_manager`](#-k8s--container_manager)
 * [`container_runtime_service`](#-k8s--container_runtime_service)
 * [`crio_package`](#-k8s--crio_package)
+* [`runc_version`](#-k8s--runc_version)
 * [`manage_etcd`](#-k8s--manage_etcd)
 * [`manage_firewall`](#-k8s--manage_firewall)
 * [`manage_image`](#-k8s--manage_image)
@@ -97,7 +98,6 @@ The following parameters are available in the `k8s` class:
 * [`node_auth`](#-k8s--node_auth)
 * [`incluster_master`](#-k8s--incluster_master)
 * [`master`](#-k8s--master)
-* [`etcd_servers`](#-k8s--etcd_servers)
 * [`service_cluster_cidr`](#-k8s--service_cluster_cidr)
 * [`cluster_cidr`](#-k8s--cluster_cidr)
 * [`api_service_address`](#-k8s--api_service_address)
@@ -135,7 +135,7 @@ Data type: `String[1]`
 
 
 
-Default value: `'1.20.14'`
+Default value: `'1.26.1'`
 
 ##### <a name="-k8s--etcd_version"></a>`etcd_version`
 
@@ -193,6 +193,14 @@ Data type: `Optional[String[1]]`
 
 Default value: `undef`
 
+##### <a name="-k8s--runc_version"></a>`runc_version`
+
+Data type: `String[1]`
+
+
+
+Default value: `'installed'`
+
 ##### <a name="-k8s--manage_etcd"></a>`manage_etcd`
 
 Data type: `Boolean`
@@ -337,14 +345,6 @@ Data type: `Stdlib::HTTPUrl`
 
 Default value: `'https://kubernetes:6443'`
 
-##### <a name="-k8s--etcd_servers"></a>`etcd_servers`
-
-Data type: `Optional[Array[Stdlib::HTTPUrl]]`
-
-
-
-Default value: `undef`
-
 ##### <a name="-k8s--service_cluster_cidr"></a>`service_cluster_cidr`
 
 Data type: `K8s::CIDR`
@@ -890,6 +890,7 @@ The following parameters are available in the `k8s::server` class:
 * [`manage_resources`](#-k8s--server--manage_resources)
 * [`node_on_server`](#-k8s--server--node_on_server)
 * [`puppetdb_discovery_tag`](#-k8s--server--puppetdb_discovery_tag)
+* [`etcd_servers`](#-k8s--server--etcd_servers)
 
 ##### <a name="-k8s--server--ensure"></a>`ensure`
 
@@ -1059,6 +1060,14 @@ Data type: `String[1]`
 
 Default value: `$k8s::puppetdb_discovery_tag`
 
+##### <a name="-k8s--server--etcd_servers"></a>`etcd_servers`
+
+Data type: `Optional[Array[Stdlib::HTTPUrl]]`
+
+
+
+Default value: `undef`
+
 ### <a name="k8s--server--apiserver"></a>`k8s::server::apiserver`
 
 Installs and configures a Kubernetes apiserver
@@ -1119,7 +1128,7 @@ Data type: `Optional[Array[Stdlib::HTTPUrl]]`
 
 
 
-Default value: `undef`
+Default value: `$k8s::server::etcd_servers`
 
 ##### <a name="-k8s--server--apiserver--discover_etcd_servers"></a>`discover_etcd_servers`
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -3,7 +3,7 @@
  K8s::Ensure $ensure = 'present',
  Enum['container', 'native'] $packaging = 'native',
  K8s::Native_packaging $native_packaging = 'loose',
- String[1] $version = '1.20.14',
+ String[1] $version = '1.26.1',
  String[1] $etcd_version = '3.5.1',
 
  String[1] $container_registry = 'gcr.io/google_containers',
@@ -12,6 +12,7 @@
  Enum['docker', 'crio'] $container_manager = 'crio',
  String[1] $container_runtime_service = "${container_manager}.service",
  Optional[String[1]] $crio_package = undef,
+ String[1] $runc_version = 'installed',
 
  Boolean $manage_etcd = true,
  Boolean $manage_firewall = false,
@@ -35,7 +36,6 @@
 
  Stdlib::HTTPUrl $incluster_master = 'https://kubernetes.default.svc',
  Stdlib::HTTPUrl $master = 'https://kubernetes:6443',
- Optional[Array[Stdlib::HTTPUrl]] $etcd_servers = undef,
  K8s::CIDR $service_cluster_cidr = '10.1.0.0/24',
  K8s::CIDR $cluster_cidr = '10.0.0.0/16',
  Stdlib::IP::Address::Nosubnet $api_service_address = k8s::ip_in_cidr($service_cluster_cidr, 'first'),
@@ -89,6 +89,12 @@
  line => 'cgroup_manager = "systemd"',
  match => '^cgroup_manager',
  }
+
+ # is needed by cri-o but its not a dependency of the package
+ package { 'runc':
+ ensure => $runc_version,
+ }
+
  if $manage_repo {
  Class['k8s::repo'] -> Package['k8s container manager']
  }
@@ -135,7 +141,6 @@
  content => epp('k8s/sysconfig.epp', {
  comment => 'General Kubernetes Configuration',
  environment_variables => {
- 'KUBE_LOGTOSTDERR' => '--alsologtostderr',
  'KUBE_LOG_LEVEL' => '',
  },
  }),

diff --git a/manifests/server.pp b/manifests/server.pp
@@ -24,6 +24,8 @@
  Boolean $manage_resources = true,
  Boolean $node_on_server = true,
  String[1] $puppetdb_discovery_tag = $k8s::puppetdb_discovery_tag,
+
+ Optional[Array[Stdlib::HTTPUrl]] $etcd_servers = undef,
 ) {
  if $manage_etcd {
  class { 'k8s::server::etcd':

diff --git a/manifests/server/apiserver.pp b/manifests/server/apiserver.pp
@@ -6,7 +6,7 @@
 
  K8s::CIDR $service_cluster_cidr = $k8s::service_cluster_cidr,
 
- Optional[Array[Stdlib::HTTPUrl]] $etcd_servers = undef,
+ Optional[Array[Stdlib::HTTPUrl]] $etcd_servers = $k8s::server::etcd_servers,
  Boolean $discover_etcd_servers = $k8s::puppetdb_discovery,
  Boolean $manage_firewall = $k8s::server::manage_firewall,
  String $puppetdb_discovery_tag = $k8s::server::puppetdb_discovery_tag,

diff --git a/manifests/server/resources.pp b/manifests/server/resources.pp
@@ -459,7 +459,6 @@
  '/usr/local/bin/kube-proxy',
  ],
  args => k8s::format_arguments({
- alsologtostderr => true,
  log_file => '/var/log/kube-proxy.log',
  cluster_cidr => $cluster_cidr,
  hostname_override => '$(NODE_NAME)',