Merge pull request puppetlabs#625 from r-tierney/general_fixes

General fixes
NeCTAR-RC · May 17, 2023 · c4f8242 · c4f8242
2 parents 8611746 + 02aa06d
commit c4f8242
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -377,7 +377,7 @@ For example,
 
 The configuration for the image pause container.
 
-Default `k8s.gcr.io/pause:3.2`.
+Default `registry.k8s.io/pause:3.2`.
 
 ### `containerd_socket`
 
@@ -671,7 +671,7 @@ Defaults to `undef`.
 
 The container registry to pull control plane images from.
 
-Defaults to k8s.gcr.io
+Defaults to registry.k8s.io
 
 #### `install_dashboard`
 

diff --git a/REFERENCE.md b/REFERENCE.md
@@ -648,7 +648,7 @@ the files if they do not exist.
 
 [*containerd_sandbox_image*]
  The configuration for the image pause container
- Defaults k8s.gcr.io/pause:3.2
+ Defaults registry.k8s.io/pause:3.2
 
 [*dns_domain*]
   This is a string that sets the dns domain in kubernetes cluster
@@ -949,7 +949,7 @@ Example:
 
 [*image_repository*]
  The container registry to pull control plane images from
- Defaults to k8s.gcr.io
+ Defaults to registry.k8s.io
 
 [*kubeadm_extra_config*]
  A hash containing extra configuration data to be serialised with `to_yaml` and appended to the config.yaml file used by kubeadm.
@@ -1996,7 +1996,7 @@ Data type: `String`
 
 
 
-Default value: `'k8s.gcr.io/pause:3.2'`
+Default value: `'registry.k8s.io/pause:3.2'`
 
 ##### <a name="-kubernetes--etcd_archive"></a>`etcd_archive`
 
@@ -2274,7 +2274,7 @@ Data type: `String`
 
 
 
-Default value: `'k8s.gcr.io'`
+Default value: `'registry.k8s.io'`
 
 ##### <a name="-kubernetes--default_path"></a>`default_path`
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -75,7 +75,7 @@
 #
 # [*containerd_sandbox_image*]
 #  The configuration for the image pause container
-#  Defaults k8s.gcr.io/pause:3.2
+#  Defaults registry.k8s.io/pause:3.2
 #
 # [*dns_domain*]
 #   This is a string that sets the dns domain in kubernetes cluster
@@ -376,7 +376,7 @@
 #
 # [*image_repository*]
 #  The container registry to pull control plane images from
-#  Defaults to k8s.gcr.io
+#  Defaults to registry.k8s.io
 #
 # [*kubeadm_extra_config*]
 #  A hash containing extra configuration data to be serialised with `to_yaml` and appended to the config.yaml file used by kubeadm.
@@ -697,7 +697,7 @@
     },
   },
   Enum['runc','nvidia'] $containerd_default_runtime_name  = 'runc',
-  String $containerd_sandbox_image                        = 'k8s.gcr.io/pause:3.2',
+  String $containerd_sandbox_image                        = 'registry.k8s.io/pause:3.2',
   String $etcd_archive                                    = "etcd-v${etcd_version}-linux-amd64.tar.gz",
   Optional[String] $etcd_archive_checksum                 = undef,
   String $etcd_package_name                               = 'etcd-server',
@@ -734,7 +734,7 @@
   Boolean $manage_kernel_modules                          = true,
   Boolean $manage_sysctl_settings                         = true,
   Boolean $create_repos                                   = true,
-  String $image_repository                                = 'k8s.gcr.io',
+  String $image_repository                                = 'registry.k8s.io',
   Array[String] $default_path                             = ['/usr/bin', '/usr/sbin', '/bin', '/sbin', '/usr/local/bin'],
   String $cgroup_driver                                   = $facts['os']['family'] ? {
     'RedHat' => 'systemd',

diff --git a/templates/0-containerd.conf.erb b/templates/0-containerd.conf.erb
@@ -1,2 +1,2 @@
 [Service]
-Environment="KUBELET_EXTRA_ARGS=--container-runtime=remote --runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
+Environment="KUBELET_EXTRA_ARGS=--runtime-request-timeout=15m --container-runtime-endpoint=unix:///run/containerd/containerd.sock"
diff --git a/templates/v1beta3/config_kubeadm.yaml.erb b/templates/v1beta3/config_kubeadm.yaml.erb
@@ -150,4 +150,3 @@ mode: "<%= @proxy_mode %>"
 nodePortAddresses: null
 oomScoreAdj: -999
 portRange: ""
-udpIdleTimeout: 250ms
diff --git a/tooling/kube_tool/other_params.rb b/tooling/kube_tool/other_params.rb
@@ -25,7 +25,7 @@ def OtherParams.create(opts)
       cni_network_provider = 'https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml'
       cni_pod_cidr = '10.244.0.0/16'
     when 'calico'
-      cni_network_provider = "https://docs.projectcalico.org/archive/#{opts[:cni_provider_version]}/manifests/calico.yaml"
+      cni_network_provider = "https://docs.projectcalico.org/archive/v#{opts[:cni_provider_version]}/manifests/calico.yaml"
       cni_pod_cidr = '192.168.0.0/16'
     when 'calico-tigera'
       cni_network_preinstall = "https://docs.projectcalico.org/manifests/tigera-operator.yaml"