Skip to content

Commit 122eb75

Browse files
authored
Introduce inclusive naming check and update existing language (#641)
We are following the Inclusive Naming Initiative's guidance as that is what the CNCF supports.
1 parent 25403bf commit 122eb75

File tree

8 files changed

+31
-18
lines changed

8 files changed

+31
-18
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
name: Check inclusive language
3+
4+
on:
5+
pull_request:
6+
types: ['opened', 'reopened']
7+
8+
jobs:
9+
check-inclusive-language:
10+
uses: vmware-tanzu/carvel-release-scripts/.github/workflows/inclusive-language-check.yml@main

.wokeignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# out of our control
2+
vendor/
3+
examples/resource-ordering/README.md

examples/cf-for-k8s-v0.2.0-custom/config.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -10777,7 +10777,7 @@ data:
1077710777
require_client_certificate: true
1077810778

1077910779

10780-
# Manual 'whitebox' mode
10780+
# Manual 'open-box' mode
1078110781
- name: "local.15019"
1078210782
address:
1078310783
socket_address:
@@ -14144,7 +14144,7 @@ data:
1414414144
url: https://uaa.cf.cppforlife.io/authenticate
1414514145
limitedFunctionality:
1414614146
enabled: false
14147-
whitelist:
14147+
whitelist: # wokeignore:rule=whitelist
1414814148
endpoints:
1414914149
- /oauth/authorize/**
1415014150
- /oauth/token/**

examples/gitops/guestbook/all-in-one.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ spec:
8787
spec:
8888
containers:
8989
- name: replica
90-
image: gcr.io/google_samples/gb-redisslave:v1
90+
image: gcr.io/google_samples/gb-redisslave:v1 # wokeignore:rule=slave
9191
resources:
9292
requests:
9393
cpu: 100m

examples/istio-v1.4.0/istio.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7283,7 +7283,7 @@ data:
72837283
filename: /etc/certs/key.pem
72847284
72857285
7286-
# Manual 'whitebox' mode
7286+
# Manual 'open-box' mode
72877287
- name: "local.15019"
72887288
address:
72897289
socket_address:

pkg/kapp/clusterapply/applying_changes.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func (c *ApplyingChanges) Apply(allChanges []*ctldgraph.Change) ([]WaitingChange
118118
}
119119

120120
func (c *ApplyingChanges) Complete() error {
121-
// Sanity check that we applied all changes
121+
// Confidence check that we applied all changes
122122
if c.numTotal != c.numApplied() {
123123
return fmt.Errorf("Internal inconsistency: did not apply all changes: %d != %d",
124124
c.numTotal, c.numApplied())

pkg/kapp/diffgraph/assets/cf-for-k8s.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This file was generated from github.com/cloudfoundry/cf-for-k8s@bb1b88a0c22eb265378258b0f0a65eead00b94de
2-
# with bunch of dummy secrets. It's used as a complex test fixture for testing ordering.
2+
# with bunch of placeholder secrets. It's used as a complex test fixture for testing ordering.
33

44
apiVersion: apps/v1
55
kind: Deployment
@@ -10484,7 +10484,7 @@ data:
1048410484
require_client_certificate: true
1048510485

1048610486

10487-
# Manual 'whitebox' mode
10487+
# Manual 'open-box' mode
1048810488
- name: "local.15019"
1048910489
address:
1049010490
socket_address:
@@ -13851,7 +13851,7 @@ data:
1385113851
url: https://uaa.cf.cppforlife.io/authenticate
1385213852
limitedFunctionality:
1385313853
enabled: false
13854-
whitelist:
13854+
whitelist: # wokeignore:rule=whitelist
1385513855
endpoints:
1385613856
- /oauth/authorize/**
1385713857
- /oauth/token/**

test/e2e/ignore_failing_api_services_flag_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ func TestIgnoreFailingAPIServices(t *testing.T) {
2121
apiVersion: apiregistration.k8s.io/v1
2222
kind: APIService
2323
metadata:
24-
name: v1.dummykapptest.com
24+
name: v1.samplekapptest.com
2525
annotations:
2626
kapp.k14s.io/disable-default-change-group-and-rules: ""
2727
kapp.k14s.io/change-group: "apiservice"
2828
spec:
29-
group: dummykapptest.com
29+
group: samplekapptest.com
3030
groupPriorityMinimum: 100
3131
insecureSkipTLSVerify: true
3232
service:
@@ -38,12 +38,12 @@ spec:
3838
apiVersion: apiextensions.k8s.io/v1
3939
kind: CustomResourceDefinition
4040
metadata:
41-
name: foo.dummykapptest.com
41+
name: foo.samplekapptest.com
4242
annotations:
4343
kapp.k14s.io/disable-default-change-group-and-rules: ""
4444
kapp.k14s.io/change-rule: "upsert after upserting apiservice"
4545
spec:
46-
group: dummykapptest.com
46+
group: samplekapptest.com
4747
versions:
4848
- name: v1
4949
served: true
@@ -77,7 +77,7 @@ metadata:
7777

7878
yaml3 := `
7979
---
80-
apiVersion: dummykapptest.com/v1
80+
apiVersion: samplekapptest.com/v1
8181
kind: Foo
8282
metadata:
8383
name: test-uses-failing-api-service
@@ -129,7 +129,7 @@ metadata:
129129
AllowError: true, IntoNs: true, StdinReader: strings.NewReader(yaml3)})
130130
require.Errorf(t, err, "Expected error when deploying with failing api service")
131131

132-
require.Contains(t, err.Error(), "unable to retrieve the complete list of server APIs: dummykapptest.com/v1: the server is currently unable to handle the request",
132+
require.Contains(t, err.Error(), "unable to retrieve the complete list of server APIs: samplekapptest.com/v1: the server is currently unable to handle the request",
133133
"Expected api retrieval error")
134134
})
135135

@@ -140,7 +140,7 @@ metadata:
140140
AllowError: true, IntoNs: true, StdinReader: strings.NewReader(yaml3)})
141141
require.Errorf(t, err, "Expected error when deploying with failing api service")
142142

143-
require.Contains(t, err.Error(), "Expected to find kind 'dummykapptest.com/v1/Foo', but did not", "Expected CRD retrieval error")
143+
require.Contains(t, err.Error(), "Expected to find kind 'samplekapptest.com/v1/Foo', but did not", "Expected CRD retrieval error")
144144
})
145145

146146
logger.Section("delete app that does not use api service", func() {
@@ -162,9 +162,9 @@ func TestIgnoreFailingGroupVersion(t *testing.T) {
162162
apiVersion: apiextensions.k8s.io/v1
163163
kind: CustomResourceDefinition
164164
metadata:
165-
name: foo.dummykapptest.com
165+
name: foo.samplekapptest.com
166166
spec:
167-
group: dummykapptest.com
167+
group: samplekapptest.com
168168
versions:
169169
# v1 is available and used for internal storage
170170
- name: v1
@@ -225,7 +225,7 @@ metadata:
225225

226226
yaml3 := `
227227
---
228-
apiVersion: dummykapptest.com/v2
228+
apiVersion: samplekapptest.com/v2
229229
kind: Foo
230230
metadata:
231231
name: test-uses-failing-group-version

0 commit comments

Comments
 (0)