Skip to content

Commit 5e9bb01

Browse files
authored
Merge pull request #8653 from afbjorklund/buildroot-revert-go
Revert "The config flag for go packages were both changed"
2 parents 4623a76 + 9bc5cf8 commit 5e9bb01

File tree

12 files changed

+87
-155
lines changed

12 files changed

+87
-155
lines changed

deploy/iso/minikube-iso/package/cni-plugins/Config.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ config BR2_PACKAGE_CNI_PLUGINS
22
bool "cni-plugins"
33
default y
44
depends on BR2_x86_64
5-
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
5+
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS

deploy/iso/minikube-iso/package/cni/Config.in

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ config BR2_PACKAGE_CNI
22
bool "cni"
33
default y
44
depends on BR2_x86_64
5-
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
5+
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
config BR2_PACKAGE_CONMON
22
bool "conmon"
3-
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
4-
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
3+
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
4+
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
55
depends on BR2_TOOLCHAIN_HAS_THREADS
66
select BR2_PACKAGE_LIBGLIB2
77
select BR2_PACKAGE_SYSTEMD

deploy/iso/minikube-iso/package/containerd-bin/Config.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ config BR2_PACKAGE_CONTAINERD_BIN
22
bool "containerd-bin"
33
default y
44
depends on BR2_x86_64
5-
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
6-
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
5+
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
6+
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
77
depends on BR2_TOOLCHAIN_HAS_THREADS
88
depends on BR2_USE_MMU # lvm2
99
depends on !BR2_STATIC_LIBS # lvm2

deploy/iso/minikube-iso/package/crio-bin/Config.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ config BR2_PACKAGE_CRIO_BIN
22
bool "crio-bin"
33
default y
44
depends on BR2_x86_64
5-
depends on BR2_PACKAGE_HOST_GO_TARGET_ARCH_SUPPORTS
6-
depends on BR2_PACKAGE_HOST_GO_TARGET_CGO_LINKING_SUPPORTS
5+
depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS
6+
depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS
77
depends on BR2_TOOLCHAIN_HAS_THREADS
88
depends on BR2_USE_MMU # lvm2
99
depends on !BR2_STATIC_LIBS # lvm2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2+
#if !defined(CONFIG_H)
3+
#define CONFIG_H
4+
5+
#define BUF_SIZE 8192
6+
#define STDIO_BUF_SIZE 8192
7+
#define DEFAULT_SOCKET_PATH "/var/run/crio"
8+
9+
#endif // CONFIG_H

deploy/iso/minikube-iso/package/crio-bin/crio-bin.hash

-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,3 @@ sha256 05f9614c4d5970b4662499b84c270b0ab953596ee863dcd09c9dc7a2d2f09789 v1.16.0.
1212
sha256 57e1ee990ef2d5af8b32c33a21b4998682608e3556dcf1d3349666f55e7d95b9 v1.16.1.tar.gz
1313
sha256 23a797762e4544ee7c171ef138cfc1141a3f0acc2838d9965c2a58e53b16c3ae v1.17.0.tar.gz
1414
sha256 7967e9218fdfb59d6005a9e19c1668469bc5566c2a35927cffe7de8656bb22c7 v1.17.1.tar.gz
15-
sha256 865ded95aceb3a33a391b252522682de6b37b39498704c490b3a321dbefaafcb v1.18.0.tar.gz
16-
sha256 794ddc36c2a20fde91fc6cc2c6f02ebdaea85c69b51b67f3994090dbbdbc2a50 v1.18.1.tar.gz
17-
sha256 25dc558fbabc987bd58c7eab5230121b258a7b0eb34a49dc6595f1c6f3969116 v1.18.2.tar.gz

deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
#
55
################################################################################
66

7-
CRIO_BIN_VERSION = v1.18.2
8-
CRIO_BIN_COMMIT = 7f261aeebffed079b4475dde8b9d602b01973d33
7+
CRIO_BIN_VERSION = v1.17.1
8+
CRIO_BIN_COMMIT = ee2de87bd8e2a7a84799476cb4fc4ce8a78fdf6d
99
CRIO_BIN_SITE = https://github.com/cri-o/cri-o/archive
1010
CRIO_BIN_SOURCE = $(CRIO_BIN_VERSION).tar.gz
1111
CRIO_BIN_DEPENDENCIES = host-go libgpgme
@@ -32,7 +32,7 @@ endef
3232

3333
define CRIO_BIN_BUILD_CMDS
3434
mkdir -p $(@D)/bin
35-
$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) COMMIT_NO=$(CRIO_BIN_COMMIT) PREFIX=/usr binaries
35+
$(CRIO_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) GIT_COMMIT=$(CRIO_BIN_COMMIT) PREFIX=/usr binaries
3636
endef
3737

3838
define CRIO_BIN_INSTALL_TARGET_CMDS

deploy/iso/minikube-iso/package/crio-bin/crio.conf

+30-67
Original file line numberDiff line numberDiff line change
@@ -35,27 +35,22 @@ storage_driver = "overlay"
3535
# the kubelet. The log directory specified must be an absolute directory.
3636
log_dir = "/var/log/crio/pods"
3737

38-
# Location for CRI-O to lay down the temporary version file.
39-
# It is used to check if crio wipe should wipe containers, which should
40-
# always happen on a node reboot
41-
version_file = "/var/run/crio/version"
42-
43-
# Location for CRI-O to lay down the persistent version file.
44-
# It is used to check if crio wipe should wipe images, which should
45-
# only happen when CRI-O has been upgraded
46-
version_file_persist = "/var/lib/crio/version"
38+
# Location for CRI-O to lay down the version file
39+
version_file = "/var/lib/crio/version"
4740

4841
# The crio.api table contains settings for the kubelet/gRPC interface.
4942
[crio.api]
5043

5144
# Path to AF_LOCAL socket on which CRI-O will listen.
5245
listen = "/var/run/crio/crio.sock"
5346

47+
# Host IP considered as the primary IP to use by CRI-O for things such as host network IP.
48+
host_ip = ""
49+
5450
# IP address on which the stream server will listen.
5551
stream_address = "127.0.0.1"
5652

57-
# The port on which the stream server will listen. If the port is set to "0", then
58-
# CRI-O will allocate a random free port number.
53+
# The port on which the stream server will listen.
5954
stream_port = "0"
6055

6156
# Enable encrypted TLS transport of the stream server.
@@ -99,10 +94,6 @@ default_runtime = "runc"
9994
# If true, the runtime will not use pivot_root, but instead use MS_MOVE.
10095
no_pivot = false
10196

102-
# decryption_keys_path is the path where the keys required for
103-
# image decryption are stored. This option supports live configuration reload.
104-
decryption_keys_path = "/etc/crio/keys/"
105-
10697
# Path to the conmon binary, used for monitoring the OCI runtime.
10798
# Will be searched for using $PATH if empty.
10899
conmon = "/usr/libexec/crio/conmon"
@@ -116,26 +107,17 @@ conmon_env = [
116107
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
117108
]
118109

119-
# Additional environment variables to set for all the
120-
# containers. These are overridden if set in the
121-
# container image spec or in the container runtime configuration.
122-
default_env = [
123-
]
124-
125110
# If true, SELinux will be used for pod separation on the host.
126111
selinux = false
127112

128113
# Path to the seccomp.json profile which is used as the default seccomp profile
129114
# for the runtime. If not specified, then the internal default seccomp profile
130-
# will be used. This option supports live configuration reload.
115+
# will be used.
131116
seccomp_profile = ""
132117

133118
# Used to change the name of the default AppArmor profile of CRI-O. The default
134-
# profile name is "crio-default". This profile only takes effect if the user
135-
# does not specify a profile via the Kubernetes Pod's metadata annotation. If
136-
# the profile is set to "unconfined", then this equals to disabling AppArmor.
137-
# This option supports live configuration reload.
138-
apparmor_profile = "crio-default"
119+
# profile name is "crio-default-" followed by the version string of CRI-O.
120+
apparmor_profile = "crio-default-1.16.1"
139121

140122
# Cgroup management implementation used for the runtime.
141123
cgroup_manager = "systemd"
@@ -144,15 +126,17 @@ cgroup_manager = "systemd"
144126
# only the capabilities defined in the containers json file by the user/kube
145127
# will be added.
146128
default_capabilities = [
147-
"CHOWN",
148-
"DAC_OVERRIDE",
149-
"FSETID",
150-
"FOWNER",
151-
"SETGID",
152-
"SETUID",
153-
"SETPCAP",
154-
"NET_BIND_SERVICE",
155-
"KILL",
129+
"CHOWN",
130+
"DAC_OVERRIDE",
131+
"FSETID",
132+
"FOWNER",
133+
"NET_RAW",
134+
"SETGID",
135+
"SETUID",
136+
"SETPCAP",
137+
"NET_BIND_SERVICE",
138+
"SYS_CHROOT",
139+
"KILL",
156140
]
157141

158142
# List of default sysctls. If it is empty or commented out, only the sysctls
@@ -167,10 +151,8 @@ default_sysctls = [
167151
additional_devices = [
168152
]
169153

170-
# Path to OCI hooks directories for automatically executed hooks. If one of the
171-
# directories does not exist, then CRI-O will automatically skip them.
154+
# Path to OCI hooks directories for automatically executed hooks.
172155
hooks_dir = [
173-
"/usr/share/containers/oci/hooks.d",
174156
]
175157

176158
# List of default mounts for each container. **Deprecated:** this option will
@@ -218,13 +200,9 @@ bind_mount_prefix = ""
218200
read_only = false
219201

220202
# Changes the verbosity of the logs based on the level it is set to. Options
221-
# are fatal, panic, error, warn, info, debug and trace. This option supports
222-
# live configuration reload.
223-
log_level = "info"
224-
225-
# Filter the log messages by the provided regular expression.
226-
# This option supports live configuration reload.
227-
log_filter = ""
203+
# are fatal, panic, error, warn, info, and debug. This option supports live
204+
# configuration reload.
205+
log_level = "error"
228206

229207
# The UID mappings for the user namespace of each container. A range is
230208
# specified in the form containerUID:HostUID:Size. Multiple ranges must be
@@ -237,23 +215,12 @@ uid_mappings = ""
237215
gid_mappings = ""
238216

239217
# The minimal amount of time in seconds to wait before issuing a timeout
240-
# regarding the proper termination of the container. The lowest possible
241-
# value is 30s, whereas lower values are not considered by CRI-O.
242-
ctr_stop_timeout = 30
243-
244-
# **DEPRECATED** this option is being replaced by manage_ns_lifecycle, which is described below.
245-
# manage_network_ns_lifecycle = false
218+
# regarding the proper termination of the container.
219+
ctr_stop_timeout = 0
246220

247-
# manage_ns_lifecycle determines whether we pin and remove namespaces
248-
# and manage their lifecycle
249-
manage_ns_lifecycle = false
250-
251-
# The directory where the state of the managed namespaces gets tracked.
252-
# Only used when manage_ns_lifecycle is true.
253-
namespaces_dir = "/var/run"
254-
255-
# pinns_path is the path to find the pinns binary, which is needed to manage namespace lifecycle
256-
pinns_path = "/usr/bin/pinns"
221+
# ManageNetworkNSLifecycle determines whether we pin and remove network namespace
222+
# and manage its lifecycle.
223+
manage_network_ns_lifecycle = false
257224

258225
# The "crio.runtime.runtimes" table defines a list of OCI compatible runtimes.
259226
# The runtime to use is picked based on the runtime_handler provided by the CRI.
@@ -314,7 +281,7 @@ global_auth_file = ""
314281

315282
# The image used to instantiate infra containers.
316283
# This option supports live configuration reload.
317-
pause_image = "k8s.gcr.io/pause:3.2"
284+
pause_image = "k8s.gcr.io/pause:3.1"
318285

319286
# The path to a file containing credentials specific for pulling the pause_image from
320287
# above. The file is similar to that of /var/lib/kubelet/config.json
@@ -357,10 +324,6 @@ registries = [
357324
# CNI plugins.
358325
[crio.network]
359326

360-
# The default CNI network name to be selected. If not set or "", then
361-
# CRI-O will pick-up the first one found in network_dir.
362-
# cni_default_network = ""
363-
364327
# Path to the directory where CNI configuration files are located.
365328
network_dir = "/etc/cni/net.d/"
366329

0 commit comments

Comments
 (0)