From c31dc9b26054104c749cf7551f92b888a24c2586 Mon Sep 17 00:00:00 2001 From: Ashley Cui Date: Wed, 8 Jul 2020 08:50:48 -0400 Subject: Fix & add notes regarding problematic language in codebase Podman is committed to inclusivity, a core value of open source. Historically, there have been technology terms that are problematic and divisive, and should be changed. We are currently taking time to audit our repository in order to eliminate such terminology, and replace it with more inclusive terms. We are starting where we can, with our own code, comments, and documentation. However, such terms may be used in dependencies, and must be used in our repositories at the current moment for compatibility. Podman will change these terms in our repo as soon as new and better terminology is available to us via our dependencies. For more information: https://www.redhat.com/en/blog/making-open-source-more-inclusive-eradicating-problematic-language?sc_cid=701600000011gf0AAA Signed-off-by: Ashley Cui --- pkg/util/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/util') diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 47d3e231d..7a8d64e7c 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -641,7 +641,7 @@ func ValidateSysctls(strSlice []string) (map[string]string, error) { } } if !foundMatch { - return nil, errors.Errorf("sysctl '%s' is not whitelisted", arr[0]) + return nil, errors.Errorf("sysctl '%s' is not allowed", arr[0]) } } return sysctl, nil -- cgit v1.2.3-54-g00ecf From 11f716094cf2f6654d0ea4ee75e2a0bedb18900c Mon Sep 17 00:00:00 2001 From: Tristan Cacqueray Date: Tue, 14 Jul 2020 14:45:16 +0000 Subject: play-kube: add suport for "IfNotPresent" pull type This change prevents this exception when loading a pod spec using the "IfNotPresent" pull policy: Error: invalid pull type "IfNotPresent" Signed-off-by: Tristan Cacqueray --- pkg/util/utils.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/util') diff --git a/pkg/util/utils.go b/pkg/util/utils.go index 7a8d64e7c..9eeb116c0 100644 --- a/pkg/util/utils.go +++ b/pkg/util/utils.go @@ -555,7 +555,7 @@ func ValidatePullType(pullType string) (PullType, error) { switch pullType { case "always": return PullImageAlways, nil - case "missing": + case "missing", "IfNotPresent": return PullImageMissing, nil case "never": return PullImageNever, nil -- cgit v1.2.3-54-g00ecf