Skip to content

Commit 8314950

Browse files
authored
Replace misc. occurrences of whitelist/blacklist (istio#25479)
As part of istio#25381
1 parent e02690f commit 8314950

File tree

9 files changed

+20
-20
lines changed

9 files changed

+20
-20
lines changed

Diff for: codecov.threshold

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# unexpected drop of code coverage. And this supplements the packages specified
33
# in codecov.skip.
44
#
5-
# This is useful to temporarily whitelist the packages that have either non
5+
# This is useful to temporarily allowlist the packages that have either non
66
# deterministic code path. (E.g. test may retry on failure. Some paths may not
77
# be exercised when there is no error, but are hit when there is an error
88
# before the test retries.)
99
#
1010
# Ideally this file should contain only istio.io=x as the default. All other
11-
# whitelisted packages or files should eventually be removed when the tests
11+
# allowlisted packages or files should eventually be removed when the tests
1212
# are made deteministic.
1313
#
1414
# Format:

Diff for: manifests/charts/global.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ global:
9595
# The number of successive failed probes before indicating readiness failure.
9696
readinessFailureThreshold: 30
9797

98-
# istio egress capture whitelist
98+
# istio egress capture allowlist
9999
# https://istio.io/docs/tasks/traffic-management/egress.html#calling-external-services-directly
100100
# example: includeIPRanges: "172.30.0.0/16,172.20.0.0/16"
101101
# would only capture egress traffic on those two IP Ranges, all other outbound traffic would
@@ -104,7 +104,7 @@ global:
104104
excludeIPRanges: ""
105105
excludeOutboundPorts: ""
106106

107-
# istio ingress capture whitelist
107+
# istio ingress capture allowlist
108108
# examples:
109109
# Redirect only selected ports: --includeInboundPorts="80,8080"
110110
excludeInboundPorts: ""

Diff for: manifests/charts/istio-control/istio-discovery/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -410,12 +410,12 @@ global:
410410
# If set, newly injected sidecars will have core dumps enabled.
411411
enableCoreDump: false
412412

413-
# istio ingress capture whitelist
413+
# istio ingress capture allowlist
414414
# examples:
415415
# Redirect only selected ports: --includeInboundPorts="80,8080"
416416
excludeInboundPorts: ""
417417

418-
# istio egress capture whitelist
418+
# istio egress capture allowlist
419419
# https://istio.io/docs/tasks/traffic-management/egress.html#calling-external-services-directly
420420
# example: includeIPRanges: "172.30.0.0/16,172.20.0.0/16"
421421
# would only capture egress traffic on those two IP Ranges, all other outbound traffic would

Diff for: operator/cmd/mesh/testdata/manifest-generate/data-snapshot/charts/global.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ global:
9797
# The number of successive failed probes before indicating readiness failure.
9898
readinessFailureThreshold: 30
9999

100-
# istio egress capture whitelist
100+
# istio egress capture allowlist
101101
# https://istio.io/docs/tasks/traffic-management/egress.html#calling-external-services-directly
102102
# example: includeIPRanges: "172.30.0.0/16,172.20.0.0/16"
103103
# would only capture egress traffic on those two IP Ranges, all other outbound traffic would
@@ -106,7 +106,7 @@ global:
106106
excludeIPRanges: ""
107107
excludeOutboundPorts: ""
108108

109-
# istio ingress capture whitelist
109+
# istio ingress capture allowlist
110110
# examples:
111111
# Redirect only selected ports: --includeInboundPorts="80,8080"
112112
excludeInboundPorts: ""

Diff for: operator/codecov.threshold

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
# unexpected drop of code coverage. And this supplements the packages specified
33
# in codecov.skip.
44
#
5-
# This is useful to temporarily whitelist the packages that have either non
5+
# This is useful to temporarily allowlist the packages that have either non
66
# deterministic code path. (E.g. test may retry on failure. Some paths may not
77
# be exercised when there is no error, but are hit when there is an error
88
# before the test retries.)
99
#
1010
# Ideally this file should contain only istio.io=x as the default. All other
11-
# whitelisted packages or files should eventually be removed when the tests
11+
# allowlisted packages or files should eventually be removed when the tests
1212
# are made deteministic.
1313
#
1414
# Format:
@@ -18,4 +18,4 @@
1818
# or go file.
1919

2020
# Istio wide default
21-
istio.io=5
21+
istio.io=5

Diff for: tests/binary/binaries_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func TestVersion(t *testing.T) {
8080

8181
var (
8282
// If this flag is present, it means "testing" was imported by code that is built by the binary
83-
blacklistedFlags = []string{
83+
denylistedFlags = []string{
8484
"--test.memprofilerate",
8585
}
8686
)
@@ -104,8 +104,8 @@ func TestFlags(t *testing.T) {
104104
t.Fatalf("--help failed with error: %v. Output: %v", err, string(out))
105105
}
106106

107-
for _, blacklist := range blacklistedFlags {
108-
if strings.Contains(string(out), blacklist) {
107+
for _, denylist := range denylistedFlags {
108+
if strings.Contains(string(out), denylist) {
109109
t.Fatalf("binary contains unexpected flags: %v", string(out))
110110
}
111111
}

Diff for: tests/integration/security/authorization_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -396,15 +396,15 @@ func TestAuthorization_NegativeMatch(t *testing.T) {
396396
// Test the policy with overlapped `paths` and `not_paths` on b.
397397
// a and x should have the same results:
398398
// - path with prefix `/prefix` should be denied explicitly.
399-
// - path `/prefix/whitelist` should be excluded from the deny.
399+
// - path `/prefix/allowlist` should be excluded from the deny.
400400
// - path `/allow` should be allowed implicitly.
401401
newTestCase(a, b, "/prefix", false),
402402
newTestCase(a, b, "/prefix/other", false),
403-
newTestCase(a, b, "/prefix/whitelist", true),
403+
newTestCase(a, b, "/prefix/allowlist", true),
404404
newTestCase(a, b, "/allow", true),
405405
newTestCase(x, b, "/prefix", false),
406406
newTestCase(x, b, "/prefix/other", false),
407-
newTestCase(x, b, "/prefix/whitelist", true),
407+
newTestCase(x, b, "/prefix/allowlist", true),
408408
newTestCase(x, b, "/allow", true),
409409

410410
// Test the policy that denies other namespace on c.

Diff for: tests/integration/security/testdata/authz/v1beta1-negative-match.yaml.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# The following policy denies access to path with prefix "/prefix" except "/prefix/whitelist" to workload b
1+
# The following policy denies access to path with prefix "/prefix" except "/prefix/allowlist" to workload b
22

33
apiVersion: "security.istio.io/v1beta1"
44
kind: AuthorizationPolicy
@@ -14,7 +14,7 @@ spec:
1414
- to:
1515
- operation:
1616
paths: ["/prefix*"]
17-
notPaths: ["/prefix/whitelist"]
17+
notPaths: ["/prefix/allowlist"]
1818
---
1919

2020
# The following policy denies access from other namespaces

Diff for: tools/istio-iptables/pkg/cmd/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ func constructConfig() *config.Config {
105105
RunValidation: viper.GetBool(constants.RunValidation),
106106
}
107107

108-
// TODO: Make this more configurable, maybe with a whitelist of users to be captured for output instead of a blacklist.
108+
// TODO: Make this more configurable, maybe with an allowlist of users to be captured for output instead of a denylist.
109109
if cfg.ProxyUID == "" {
110110
usr, err := user.Lookup(envoyUserVar.Get())
111111
var userID string

0 commit comments

Comments
 (0)