Skip to content

Commit e03eebd

Browse files
johnSchnakejohnSchnake
authored
Remove unnecessary legacy branding (#873)
Fixes #872 Signed-off-by: John Schnake <[email protected]>
1 parent cfde6a0 commit e03eebd

15 files changed

+64
-64
lines changed

‎CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ All authors to the project retain copyright to their work. However, to ensure
55
that they are only submitting work that they have rights to, we are requiring
66
everyone to acknowledge this by signing their work.
77

8-
Any copyright notices in this repo should specify the authors as "the Heptio Sonobuoy project contributors".
8+
Any copyright notices in this repo should specify the authors as "the Sonobuoy project contributors".
99

1010
To sign your work, just add a line like this at the end of your commit message:
1111

‎cmd/sonobuoy/app/gen_test.go

+11-11
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ func TestResolveConfig(t *testing.T) {
9999
sonobuoyConfig: SonobuoyConfig{},
100100
},
101101
expected: &config.Config{
102-
Namespace: "heptio-sonobuoy",
102+
Namespace: "sonobuoy",
103103
WorkerImage: "gcr.io/heptio-images/sonobuoy:" + buildinfo.Version,
104104
ImagePullPolicy: "IfNotPresent", // default
105105
PluginSelections: []plugin.Selection{
@@ -124,7 +124,7 @@ func TestResolveConfig(t *testing.T) {
124124
},
125125
},
126126
expected: &config.Config{
127-
Namespace: "heptio-sonobuoy",
127+
Namespace: "sonobuoy",
128128
WorkerImage: "gcr.io/heptio-images/sonobuoy:" + buildinfo.Version,
129129
ImagePullPolicy: "IfNotPresent", // default
130130
PluginSelections: []plugin.Selection{
@@ -152,7 +152,7 @@ func TestResolveConfig(t *testing.T) {
152152
},
153153
},
154154
expected: &config.Config{
155-
Namespace: "heptio-sonobuoy",
155+
Namespace: "sonobuoy",
156156
WorkerImage: "gcr.io/heptio-images/sonobuoy:" + buildinfo.Version,
157157
ImagePullPolicy: "IfNotPresent", // default
158158
PluginSelections: []plugin.Selection{
@@ -223,7 +223,7 @@ func TestResolveConfig(t *testing.T) {
223223
input: &genFlags{},
224224
cliInput: "--plugin e2e",
225225
expected: &config.Config{
226-
Namespace: "heptio-sonobuoy",
226+
Namespace: "sonobuoy",
227227
WorkerImage: "gcr.io/heptio-images/sonobuoy:" + buildinfo.Version,
228228
ImagePullPolicy: "IfNotPresent",
229229
PluginSelections: nil,
@@ -236,7 +236,7 @@ func TestResolveConfig(t *testing.T) {
236236
input: &genFlags{},
237237
cliInput: "--config testdata/emptyQueryAndPlugins.conf",
238238
expected: &config.Config{
239-
Namespace: "heptio-sonobuoy",
239+
Namespace: "sonobuoy",
240240
WorkerImage: "gcr.io/heptio-images/sonobuoy:" + buildinfo.Version,
241241
ImagePullPolicy: "IfNotPresent",
242242
PluginSearchPath: defaultPluginSearchPath,
@@ -294,7 +294,7 @@ func TestResolveConfigPodLogLimits(t *testing.T) {
294294
g := &genFlags{
295295
sonobuoyConfig: SonobuoyConfig{
296296
Config: config.Config{},
297-
raw: rawInput,
297+
raw: rawInput,
298298
},
299299
}
300300

@@ -304,17 +304,17 @@ func TestResolveConfigPodLogLimits(t *testing.T) {
304304
expected config.PodLogLimits
305305
}{
306306
{
307-
name: "Nil config will be overwritten by default value",
308-
input: config.PodLogLimits {
307+
name: "Nil config will be overwritten by default value",
308+
input: config.PodLogLimits{
309309
SonobuoyNamespace: nil,
310310
},
311311
expected: config.PodLogLimits{
312312
SonobuoyNamespace: defaultSonobuoyNamespace,
313313
},
314314
},
315315
{
316-
name: "Non-nil config should be preserved",
317-
input: config.PodLogLimits {
316+
name: "Non-nil config should be preserved",
317+
input: config.PodLogLimits{
318318
SonobuoyNamespace: &[]bool{false}[0],
319319
},
320320
expected: config.PodLogLimits{
@@ -329,7 +329,7 @@ func TestResolveConfigPodLogLimits(t *testing.T) {
329329

330330
if *conf.Limits.PodLogs.SonobuoyNamespace != *tc.expected.SonobuoyNamespace {
331331
t.Errorf("Expected Limits.PodLogs.SonobuoyNamespace %v but got %v",
332-
*tc.expected.SonobuoyNamespace, *conf.Limits.PodLogs.SonobuoyNamespace )
332+
*tc.expected.SonobuoyNamespace, *conf.Limits.PodLogs.SonobuoyNamespace)
333333
}
334334
}
335335
}

‎pkg/backplane/ca/ca.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ const (
4040

4141
var (
4242
pkixName = pkix.Name{
43-
Organization: []string{"Heptio"},
44-
OrganizationalUnit: []string{"sonobuoy"},
43+
Organization: []string{"VMware"},
44+
OrganizationalUnit: []string{"Sonobuoy"},
4545
Country: []string{"USA"},
46-
Locality: []string{"Seattle"},
46+
Locality: []string{"Palo Alto, CA"},
4747
}
4848

4949
randReader = rand.Reader

‎pkg/client/run.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ func (c *SonobuoyClient) Run(cfg *RunConfig) error {
103103
// polling attempts know if the status has been present yet.
104104
seenStatus := false
105105
runCondition := func() (bool, error) {
106-
// Get the heptio pod and check if its status is completed or terminated.
106+
// Get the Aggregator pod and check if its status is completed or terminated.
107107
status, err := c.GetStatus(&StatusConfig{cfg.Config.Namespace})
108108
switch {
109109
case err != nil && seenStatus:

‎pkg/client/testdata/default-plugins-via-nil-selection.golden

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
apiVersion: v1
44
kind: Namespace
55
metadata:
6-
name: heptio-sonobuoy
6+
name: sonobuoy
77
---
88
apiVersion: v1
99
kind: ServiceAccount
1010
metadata:
1111
labels:
1212
component: sonobuoy
1313
name: sonobuoy-serviceaccount
14-
namespace: heptio-sonobuoy
14+
namespace: sonobuoy
1515
---
1616
apiVersion: v1
1717
data:
1818
config.json: |
19-
{"Description":"DEFAULT","UUID":"","Version":"static-version-for-testing","ResultsDir":"/tmp/sonobuoy","Resources":["apiservices","certificatesigningrequests","clusterrolebindings","clusterroles","componentstatuses","configmaps","controllerrevisions","cronjobs","customresourcedefinitions","daemonsets","deployments","endpoints","ingresses","jobs","leases","limitranges","mutatingwebhookconfigurations","namespaces","networkpolicies","nodes","persistentvolumeclaims","persistentvolumes","poddisruptionbudgets","pods","podlogs","podsecuritypolicies","podtemplates","priorityclasses","replicasets","replicationcontrollers","resourcequotas","rolebindings","roles","servergroups","serverversion","serviceaccounts","services","statefulsets","storageclasses","validatingwebhookconfigurations","volumeattachments"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"Namespaces":"","SonobuoyNamespace":true,"FieldSelectors":[],"LabelSelector":"","Previous":false,"SinceSeconds":null,"SinceTime":null,"Timestamps":false,"TailLines":null,"LimitBytes":null,"LimitSize":"","LimitTime":""}},"QPS":30,"Burst":50,"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":null,"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"heptio-sonobuoy","WorkerImage":"gcr.io/heptio-images/sonobuoy:static-version-for-testing","ImagePullPolicy":"IfNotPresent","ImagePullSecrets":""}
19+
{"Description":"DEFAULT","UUID":"","Version":"static-version-for-testing","ResultsDir":"/tmp/sonobuoy","Resources":["apiservices","certificatesigningrequests","clusterrolebindings","clusterroles","componentstatuses","configmaps","controllerrevisions","cronjobs","customresourcedefinitions","daemonsets","deployments","endpoints","ingresses","jobs","leases","limitranges","mutatingwebhookconfigurations","namespaces","networkpolicies","nodes","persistentvolumeclaims","persistentvolumes","poddisruptionbudgets","pods","podlogs","podsecuritypolicies","podtemplates","priorityclasses","replicasets","replicationcontrollers","resourcequotas","rolebindings","roles","servergroups","serverversion","serviceaccounts","services","statefulsets","storageclasses","validatingwebhookconfigurations","volumeattachments"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"Namespaces":"","SonobuoyNamespace":true,"FieldSelectors":[],"LabelSelector":"","Previous":false,"SinceSeconds":null,"SinceTime":null,"Timestamps":false,"TailLines":null,"LimitBytes":null,"LimitSize":"","LimitTime":""}},"QPS":30,"Burst":50,"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":null,"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"sonobuoy","WorkerImage":"gcr.io/heptio-images/sonobuoy:static-version-for-testing","ImagePullPolicy":"IfNotPresent","ImagePullSecrets":""}
2020
kind: ConfigMap
2121
metadata:
2222
labels:
2323
component: sonobuoy
2424
name: sonobuoy-config-cm
25-
namespace: heptio-sonobuoy
25+
namespace: sonobuoy
2626
---
2727
apiVersion: v1
2828
data:
@@ -77,7 +77,7 @@ metadata:
7777
labels:
7878
component: sonobuoy
7979
name: sonobuoy-plugins-cm
80-
namespace: heptio-sonobuoy
80+
namespace: sonobuoy
8181
---
8282
apiVersion: v1
8383
kind: Pod
@@ -87,7 +87,7 @@ metadata:
8787
run: sonobuoy-master
8888
tier: analysis
8989
name: sonobuoy
90-
namespace: heptio-sonobuoy
90+
namespace: sonobuoy
9191
spec:
9292
containers:
9393
- command:
@@ -128,7 +128,7 @@ metadata:
128128
component: sonobuoy
129129
run: sonobuoy-master
130130
name: sonobuoy-master
131-
namespace: heptio-sonobuoy
131+
namespace: sonobuoy
132132
spec:
133133
ports:
134134
- port: 8080

‎pkg/client/testdata/default.golden

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
apiVersion: v1
44
kind: Namespace
55
metadata:
6-
name: heptio-sonobuoy
6+
name: sonobuoy
77
---
88
apiVersion: v1
99
kind: ServiceAccount
1010
metadata:
1111
labels:
1212
component: sonobuoy
1313
name: sonobuoy-serviceaccount
14-
namespace: heptio-sonobuoy
14+
namespace: sonobuoy
1515
---
1616
apiVersion: v1
1717
data:
1818
config.json: |
19-
{"Description":"DEFAULT","UUID":"","Version":"static-version-for-testing","ResultsDir":"/tmp/sonobuoy","Resources":["apiservices","certificatesigningrequests","clusterrolebindings","clusterroles","componentstatuses","configmaps","controllerrevisions","cronjobs","customresourcedefinitions","daemonsets","deployments","endpoints","ingresses","jobs","leases","limitranges","mutatingwebhookconfigurations","namespaces","networkpolicies","nodes","persistentvolumeclaims","persistentvolumes","poddisruptionbudgets","pods","podlogs","podsecuritypolicies","podtemplates","priorityclasses","replicasets","replicationcontrollers","resourcequotas","rolebindings","roles","servergroups","serverversion","serviceaccounts","services","statefulsets","storageclasses","validatingwebhookconfigurations","volumeattachments"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"Namespaces":"","SonobuoyNamespace":true,"FieldSelectors":[],"LabelSelector":"","Previous":false,"SinceSeconds":null,"SinceTime":null,"Timestamps":false,"TailLines":null,"LimitBytes":null,"LimitSize":"","LimitTime":""}},"QPS":30,"Burst":50,"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":null,"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"heptio-sonobuoy","WorkerImage":"gcr.io/heptio-images/sonobuoy:static-version-for-testing","ImagePullPolicy":"IfNotPresent","ImagePullSecrets":""}
19+
{"Description":"DEFAULT","UUID":"","Version":"static-version-for-testing","ResultsDir":"/tmp/sonobuoy","Resources":["apiservices","certificatesigningrequests","clusterrolebindings","clusterroles","componentstatuses","configmaps","controllerrevisions","cronjobs","customresourcedefinitions","daemonsets","deployments","endpoints","ingresses","jobs","leases","limitranges","mutatingwebhookconfigurations","namespaces","networkpolicies","nodes","persistentvolumeclaims","persistentvolumes","poddisruptionbudgets","pods","podlogs","podsecuritypolicies","podtemplates","priorityclasses","replicasets","replicationcontrollers","resourcequotas","rolebindings","roles","servergroups","serverversion","serviceaccounts","services","statefulsets","storageclasses","validatingwebhookconfigurations","volumeattachments"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"Namespaces":"","SonobuoyNamespace":true,"FieldSelectors":[],"LabelSelector":"","Previous":false,"SinceSeconds":null,"SinceTime":null,"Timestamps":false,"TailLines":null,"LimitBytes":null,"LimitSize":"","LimitTime":""}},"QPS":30,"Burst":50,"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":null,"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"sonobuoy","WorkerImage":"gcr.io/heptio-images/sonobuoy:static-version-for-testing","ImagePullPolicy":"IfNotPresent","ImagePullSecrets":""}
2020
kind: ConfigMap
2121
metadata:
2222
labels:
2323
component: sonobuoy
2424
name: sonobuoy-config-cm
25-
namespace: heptio-sonobuoy
25+
namespace: sonobuoy
2626
---
2727
apiVersion: v1
2828
data:
@@ -77,7 +77,7 @@ metadata:
7777
labels:
7878
component: sonobuoy
7979
name: sonobuoy-plugins-cm
80-
namespace: heptio-sonobuoy
80+
namespace: sonobuoy
8181
---
8282
apiVersion: v1
8383
kind: Pod
@@ -87,7 +87,7 @@ metadata:
8787
run: sonobuoy-master
8888
tier: analysis
8989
name: sonobuoy
90-
namespace: heptio-sonobuoy
90+
namespace: sonobuoy
9191
spec:
9292
containers:
9393
- command:
@@ -128,7 +128,7 @@ metadata:
128128
component: sonobuoy
129129
run: sonobuoy-master
130130
name: sonobuoy-master
131-
namespace: heptio-sonobuoy
131+
namespace: sonobuoy
132132
spec:
133133
ports:
134134
- port: 8080

‎pkg/client/testdata/e2e-default.golden

+7-7
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
apiVersion: v1
44
kind: Namespace
55
metadata:
6-
name: heptio-sonobuoy
6+
name: sonobuoy
77
---
88
apiVersion: v1
99
kind: ServiceAccount
1010
metadata:
1111
labels:
1212
component: sonobuoy
1313
name: sonobuoy-serviceaccount
14-
namespace: heptio-sonobuoy
14+
namespace: sonobuoy
1515
---
1616
apiVersion: v1
1717
data:
1818
config.json: |
19-
{"Description":"DEFAULT","UUID":"","Version":"static-version-for-testing","ResultsDir":"/tmp/sonobuoy","Resources":["apiservices","certificatesigningrequests","clusterrolebindings","clusterroles","componentstatuses","configmaps","controllerrevisions","cronjobs","customresourcedefinitions","daemonsets","deployments","endpoints","ingresses","jobs","leases","limitranges","mutatingwebhookconfigurations","namespaces","networkpolicies","nodes","persistentvolumeclaims","persistentvolumes","poddisruptionbudgets","pods","podlogs","podsecuritypolicies","podtemplates","priorityclasses","replicasets","replicationcontrollers","resourcequotas","rolebindings","roles","servergroups","serverversion","serviceaccounts","services","statefulsets","storageclasses","validatingwebhookconfigurations","volumeattachments"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"Namespaces":"","SonobuoyNamespace":true,"FieldSelectors":[],"LabelSelector":"","Previous":false,"SinceSeconds":null,"SinceTime":null,"Timestamps":false,"TailLines":null,"LimitBytes":null,"LimitSize":"","LimitTime":""}},"QPS":30,"Burst":50,"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":[{"name":"e2e"}],"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"heptio-sonobuoy","WorkerImage":"gcr.io/heptio-images/sonobuoy:static-version-for-testing","ImagePullPolicy":"IfNotPresent","ImagePullSecrets":""}
19+
{"Description":"DEFAULT","UUID":"","Version":"static-version-for-testing","ResultsDir":"/tmp/sonobuoy","Resources":["apiservices","certificatesigningrequests","clusterrolebindings","clusterroles","componentstatuses","configmaps","controllerrevisions","cronjobs","customresourcedefinitions","daemonsets","deployments","endpoints","ingresses","jobs","leases","limitranges","mutatingwebhookconfigurations","namespaces","networkpolicies","nodes","persistentvolumeclaims","persistentvolumes","poddisruptionbudgets","pods","podlogs","podsecuritypolicies","podtemplates","priorityclasses","replicasets","replicationcontrollers","resourcequotas","rolebindings","roles","servergroups","serverversion","serviceaccounts","services","statefulsets","storageclasses","validatingwebhookconfigurations","volumeattachments"],"Filters":{"Namespaces":".*","LabelSelector":""},"Limits":{"PodLogs":{"Namespaces":"","SonobuoyNamespace":true,"FieldSelectors":[],"LabelSelector":"","Previous":false,"SinceSeconds":null,"SinceTime":null,"Timestamps":false,"TailLines":null,"LimitBytes":null,"LimitSize":"","LimitTime":""}},"QPS":30,"Burst":50,"Server":{"bindaddress":"0.0.0.0","bindport":8080,"advertiseaddress":"","timeoutseconds":10800},"Plugins":[{"name":"e2e"}],"PluginSearchPath":["./plugins.d","/etc/sonobuoy/plugins.d","~/sonobuoy/plugins.d"],"Namespace":"sonobuoy","WorkerImage":"gcr.io/heptio-images/sonobuoy:static-version-for-testing","ImagePullPolicy":"IfNotPresent","ImagePullSecrets":""}
2020
kind: ConfigMap
2121
metadata:
2222
labels:
2323
component: sonobuoy
2424
name: sonobuoy-config-cm
25-
namespace: heptio-sonobuoy
25+
namespace: sonobuoy
2626
---
2727
apiVersion: v1
2828
data:
@@ -48,7 +48,7 @@ metadata:
4848
labels:
4949
component: sonobuoy
5050
name: sonobuoy-plugins-cm
51-
namespace: heptio-sonobuoy
51+
namespace: sonobuoy
5252
---
5353
apiVersion: v1
5454
kind: Pod
@@ -58,7 +58,7 @@ metadata:
5858
run: sonobuoy-master
5959
tier: analysis
6060
name: sonobuoy
61-
namespace: heptio-sonobuoy
61+
namespace: sonobuoy
6262
spec:
6363
containers:
6464
- command:
@@ -99,7 +99,7 @@ metadata:
9999
component: sonobuoy
100100
run: sonobuoy-master
101101
name: sonobuoy-master
102-
namespace: heptio-sonobuoy
102+
namespace: sonobuoy
103103
spec:
104104
ports:
105105
- port: 8080

0 commit comments

Comments
 (0)