Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

General fixes #625

Merged
merged 1 commit into from
May 17, 2023
Merged

General fixes #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down
8 changes: 4 additions & 4 deletions REFERENCE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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`

Expand Down Expand Up @@ -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`

Expand Down
8 changes: 4 additions & 4 deletions manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion templates/0-containerd.conf.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
1 change: 0 additions & 1 deletion templates/v1beta3/config_kubeadm.yaml.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,3 @@ mode: "<%= @proxy_mode %>"
nodePortAddresses: null
oomScoreAdj: -999
portRange: ""
udpIdleTimeout: 250ms
2 changes: 1 addition & 1 deletion tooling/kube_tool/other_params.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down