Skip to content

Commit 3ae87be

Browse files
author
Per Goncalves da Silva
committed
fix lint
Signed-off-by: Per Goncalves da Silva <[email protected]>
1 parent e3bf56f commit 3ae87be

File tree

10 files changed

+163
-168
lines changed

10 files changed

+163
-168
lines changed

‎staging/operator-lifecycle-manager/pkg/controller/operators/olm/downstream_csv_labeler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1212
)
1313

14-
const CsvLabelerPluginId plugins.PluginID = "csv-labeler-plugin"
14+
const CsvLabelerPluginID plugins.PluginID = "csv-labeler-plugin"
1515
const labelSyncerLabelKey = ""
1616

1717
func NewCSVLabelSyncerLabeler(client operatorclient.ClientInterface, logger *logrus.Logger) *CSVLabelSyncerLabeler {

‎staging/operator-lifecycle-manager/pkg/controller/operators/olm/downstream_plugins.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ func init() {
88
operatorPlugInFactoryFuncs = plugins.OperatorPlugInFactoryMap{
99
// labels unlabeled non-payload openshift-* csv namespaces with
1010
// security.openshift.io/scc.podSecurityLabelSync: true
11-
CsvLabelerPluginId: plugins.NewCsvNamespaceLabelerPluginFunc,
11+
CsvLabelerPluginID: plugins.NewCsvNamespaceLabelerPluginFunc,
1212
}
1313
}
1414

‎staging/operator-lifecycle-manager/pkg/controller/operators/olm/plugins/downstream_csv_namespace_labeler_plugin.go

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
1313
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/queueinformer"
1414
"github.com/sirupsen/logrus"
15-
v1 "k8s.io/api/core/v1"
15+
corev1 "k8s.io/api/core/v1"
1616
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1717
"k8s.io/apimachinery/pkg/labels"
1818
listerv1 "k8s.io/client-go/listers/core/v1"
@@ -42,7 +42,6 @@ type csvNamespaceLabelerPlugin struct {
4242
}
4343

4444
func NewCsvNamespaceLabelerPluginFunc(ctx context.Context, config OperatorConfig, hostOperator HostOperator) (OperatorPlugin, error) {
45-
4645
if hostOperator == nil {
4746
return nil, fmt.Errorf("cannot initialize plugin: operator undefined")
4847
}
@@ -132,12 +131,11 @@ func (p *csvNamespaceLabelerPlugin) Sync(ctx context.Context, event kubestate.Re
132131
return nil
133132
}
134133

135-
var namespace *v1.Namespace
134+
var namespace *corev1.Namespace
136135
var err error
137136

138137
// get namespace from the event resource
139138
switch eventResource := event.Resource().(type) {
140-
141139
// handle csv events
142140
case *v1alpha1.ClusterServiceVersion:
143141
// ignore copied csvs and namespaces that should be ignored
@@ -151,7 +149,7 @@ func (p *csvNamespaceLabelerPlugin) Sync(ctx context.Context, event kubestate.Re
151149
}
152150

153151
// handle namespace events
154-
case *v1.Namespace:
152+
case *corev1.Namespace:
155153
// ignore namespaces that should be ignored and ones that are already labeled
156154
if ignoreNamespace(eventResource.GetName()) || hasLabelSyncerLabel(eventResource) {
157155
return nil
@@ -184,7 +182,7 @@ func (p *csvNamespaceLabelerPlugin) Sync(ctx context.Context, event kubestate.Re
184182
return nil
185183
}
186184

187-
func (p *csvNamespaceLabelerPlugin) getNamespace(namespace string) (*v1.Namespace, error) {
185+
func (p *csvNamespaceLabelerPlugin) getNamespace(namespace string) (*corev1.Namespace, error) {
188186
ns, err := p.namespaceLister.Get(namespace)
189187
if err != nil {
190188
return nil, err
@@ -227,7 +225,7 @@ func ignoreNamespace(namespace string) bool {
227225
return !hasOpenshiftPrefix(namespace) || IsNamespacePSALabelSyncExemptedInVendoredOCPVersion(namespace)
228226
}
229227

230-
func applyLabelSyncerLabel(ctx context.Context, kubeClient operatorclient.ClientInterface, namespace *v1.Namespace) error {
228+
func applyLabelSyncerLabel(ctx context.Context, kubeClient operatorclient.ClientInterface, namespace *corev1.Namespace) error {
231229
if _, ok := namespace.GetLabels()[NamespaceLabelSyncerLabelKey]; !ok {
232230
nsCopy := namespace.DeepCopy()
233231
if nsCopy.GetLabels() == nil {
@@ -241,7 +239,7 @@ func applyLabelSyncerLabel(ctx context.Context, kubeClient operatorclient.Client
241239
return nil
242240
}
243241

244-
func hasLabelSyncerLabel(namespace *v1.Namespace) bool {
242+
func hasLabelSyncerLabel(namespace *corev1.Namespace) bool {
245243
_, ok := namespace.GetLabels()[NamespaceLabelSyncerLabelKey]
246244
return ok
247245
}

‎staging/operator-lifecycle-manager/pkg/controller/operators/olm/plugins/downstream_csv_namespace_labeler_plugin_test.go

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/kubestate"
1515
"github.com/operator-framework/operator-lifecycle-manager/pkg/lib/operatorclient"
1616
"github.com/stretchr/testify/assert"
17-
v1 "k8s.io/api/core/v1"
17+
corev1 "k8s.io/api/core/v1"
1818
apiextensionsfake "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake"
1919
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2020
"k8s.io/apimachinery/pkg/runtime"
@@ -55,7 +55,6 @@ func init() {
5555
}
5656

5757
func NewFakeCSVNamespaceLabelerPlugin(t *testing.T, options ...fakeClientOption) (*csvNamespaceLabelerPlugin, context.CancelFunc) {
58-
5958
resyncPeriod := 5 * time.Minute
6059
clientOptions := &fakeClientOptions{}
6160
for _, applyOption := range options {
@@ -74,7 +73,7 @@ func NewFakeCSVNamespaceLabelerPlugin(t *testing.T, options ...fakeClientOption)
7473
nonCopiedCsvInformer := operatorsInformerFactory.Operators().V1alpha1().ClusterServiceVersions().Informer()
7574

7675
t.Log("starting informers")
77-
ctx, cancel := context.WithCancel(context.TODO())
76+
ctx, ctxCancel := context.WithCancel(context.TODO())
7877
stopCtx := make(chan struct{})
7978
go func() {
8079
<-ctx.Done()
@@ -103,7 +102,7 @@ func NewFakeCSVNamespaceLabelerPlugin(t *testing.T, options ...fakeClientOption)
103102
nonCopiedCsvListerMap: map[string]listerv1alpha1.ClusterServiceVersionLister{
104103
metav1.NamespaceAll: listerv1alpha1.NewClusterServiceVersionLister(nonCopiedCsvInformer.GetIndexer()),
105104
},
106-
}, cancel
105+
}, ctxCancel
107106
}
108107

109108
func NewCsvInNamespace(namespace string) *v1alpha1.ClusterServiceVersion {
@@ -123,15 +122,15 @@ func NewCopiedCsvInNamespace(namespace string) *v1alpha1.ClusterServiceVersion {
123122
return csv
124123
}
125124

126-
func NewNamespace(name string) *v1.Namespace {
127-
return &v1.Namespace{
125+
func NewNamespace(name string) *corev1.Namespace {
126+
return &corev1.Namespace{
128127
ObjectMeta: metav1.ObjectMeta{
129128
Name: name,
130129
},
131130
}
132131
}
133132

134-
func NewLabeledNamespace(name string, labelValue string) *v1.Namespace {
133+
func NewLabeledNamespace(name string, labelValue string) *corev1.Namespace {
135134
ns := NewNamespace(name)
136135
ns.SetLabels(map[string]string{
137136
NamespaceLabelSyncerLabelKey: labelValue,
@@ -247,7 +246,7 @@ func Test_SyncFailsIfEventResourceIsNotCSV(t *testing.T) {
247246
plugin, shutdown := NewFakeCSVNamespaceLabelerPlugin(t)
248247
defer shutdown()
249248

250-
event := kubestate.NewResourceEvent(kubestate.ResourceAdded, v1.ConfigMap{})
249+
event := kubestate.NewResourceEvent(kubestate.ResourceAdded, corev1.ConfigMap{})
251250
assert.Error(t, plugin.Sync(context.Background(), event))
252251
}
253252

@@ -268,7 +267,7 @@ func Test_SyncFailsIfCSVCannotBeUpdated(t *testing.T) {
268267

269268
event := kubestate.NewResourceEvent(kubestate.ResourceAdded, NewCsvInNamespace(namespace))
270269
updateNsError := func(action clienttesting.Action) (handled bool, ret runtime.Object, err error) {
271-
return true, &v1.Namespace{}, errors.New("error updating namespace")
270+
return true, &corev1.Namespace{}, errors.New("error updating namespace")
272271
}
273272
plugin.kubeClient.KubernetesInterface().CoreV1().(*v1fake.FakeCoreV1).PrependReactor("update", "namespaces", updateNsError)
274273
assert.Error(t, plugin.Sync(context.Background(), event))

‎staging/operator-lifecycle-manager/pkg/controller/operators/olm/plugins/downstream_nsexcemptions.go

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -7,79 +7,79 @@ import "k8s.io/apimachinery/pkg/util/sets"
77
// IMPORTANT: The Namespace openshift-operators must be an exception to this rule
88
// since it is used by OCP/OLM users to install their Operator bundle solutions.
99
var systemNSSyncExemptions = sets.NewString(
10-
// kube-specific system namespaces
11-
"default",
12-
"kube-node-lease",
13-
"kube-public",
14-
"kube-system",
10+
// kube-specific system namespaces
11+
"default",
12+
"kube-node-lease",
13+
"kube-public",
14+
"kube-system",
1515

16-
// openshift payload namespaces
17-
"openshift",
18-
"openshift-apiserver",
19-
"openshift-apiserver-operator",
20-
"openshift-authentication",
21-
"openshift-authentication-operator",
22-
"openshift-cloud-controller-manager",
23-
"openshift-cloud-controller-manager-operator",
24-
"openshift-cloud-credential-operator",
25-
"openshift-cloud-network-config-controller",
26-
"openshift-cluster-csi-drivers",
27-
"openshift-cluster-machine-approver",
28-
"openshift-cluster-node-tuning-operator",
29-
"openshift-cluster-samples-operator",
30-
"openshift-cluster-storage-operator",
31-
"openshift-cluster-version",
32-
"openshift-config",
33-
"openshift-config-managed",
34-
"openshift-config-operator",
35-
"openshift-console",
36-
"openshift-console-operator",
37-
"openshift-console-user-settings",
38-
"openshift-controller-manager",
39-
"openshift-controller-manager-operator",
40-
"openshift-dns",
41-
"openshift-dns-operator",
42-
"openshift-etcd",
43-
"openshift-etcd-operator",
44-
"openshift-host-network",
45-
"openshift-image-registry",
46-
"openshift-infra",
47-
"openshift-ingress",
48-
"openshift-ingress-canary",
49-
"openshift-ingress-operator",
50-
"openshift-insights",
51-
"openshift-kni-infra",
52-
"openshift-kube-apiserver",
53-
"openshift-kube-apiserver-operator",
54-
"openshift-kube-controller-manager",
55-
"openshift-kube-controller-manager-operator",
56-
"openshift-kube-scheduler",
57-
"openshift-kube-scheduler-operator",
58-
"openshift-kube-storage-version-migrator",
59-
"openshift-kube-storage-version-migrator-operator",
60-
"openshift-machine-api",
61-
"openshift-machine-config-operator",
62-
"openshift-marketplace",
63-
"openshift-monitoring",
64-
"openshift-multus",
65-
"openshift-network-diagnostics",
66-
"openshift-network-operator",
67-
"openshift-node",
68-
"openshift-nutanix-infra",
69-
"openshift-oauth-apiserver",
70-
"openshift-openstack-infra",
71-
"openshift-operator-lifecycle-manager",
72-
"openshift-ovirt-infra",
73-
"openshift-sdn",
74-
"openshift-service-ca",
75-
"openshift-service-ca-operator",
76-
"openshift-user-workload-monitoring",
77-
"openshift-vsphere-infra",
16+
// openshift payload namespaces
17+
"openshift",
18+
"openshift-apiserver",
19+
"openshift-apiserver-operator",
20+
"openshift-authentication",
21+
"openshift-authentication-operator",
22+
"openshift-cloud-controller-manager",
23+
"openshift-cloud-controller-manager-operator",
24+
"openshift-cloud-credential-operator",
25+
"openshift-cloud-network-config-controller",
26+
"openshift-cluster-csi-drivers",
27+
"openshift-cluster-machine-approver",
28+
"openshift-cluster-node-tuning-operator",
29+
"openshift-cluster-samples-operator",
30+
"openshift-cluster-storage-operator",
31+
"openshift-cluster-version",
32+
"openshift-config",
33+
"openshift-config-managed",
34+
"openshift-config-operator",
35+
"openshift-console",
36+
"openshift-console-operator",
37+
"openshift-console-user-settings",
38+
"openshift-controller-manager",
39+
"openshift-controller-manager-operator",
40+
"openshift-dns",
41+
"openshift-dns-operator",
42+
"openshift-etcd",
43+
"openshift-etcd-operator",
44+
"openshift-host-network",
45+
"openshift-image-registry",
46+
"openshift-infra",
47+
"openshift-ingress",
48+
"openshift-ingress-canary",
49+
"openshift-ingress-operator",
50+
"openshift-insights",
51+
"openshift-kni-infra",
52+
"openshift-kube-apiserver",
53+
"openshift-kube-apiserver-operator",
54+
"openshift-kube-controller-manager",
55+
"openshift-kube-controller-manager-operator",
56+
"openshift-kube-scheduler",
57+
"openshift-kube-scheduler-operator",
58+
"openshift-kube-storage-version-migrator",
59+
"openshift-kube-storage-version-migrator-operator",
60+
"openshift-machine-api",
61+
"openshift-machine-config-operator",
62+
"openshift-marketplace",
63+
"openshift-monitoring",
64+
"openshift-multus",
65+
"openshift-network-diagnostics",
66+
"openshift-network-operator",
67+
"openshift-node",
68+
"openshift-nutanix-infra",
69+
"openshift-oauth-apiserver",
70+
"openshift-openstack-infra",
71+
"openshift-operator-lifecycle-manager",
72+
"openshift-ovirt-infra",
73+
"openshift-sdn",
74+
"openshift-service-ca",
75+
"openshift-service-ca-operator",
76+
"openshift-user-workload-monitoring",
77+
"openshift-vsphere-infra",
7878
)
7979

8080
// IsNamespacePSALabelSyncExemptedInVendoredOCPVersion returns true if the given namespace should be exempted from
8181
// PSA label sync'ing. NOTE: the exemption list is OCP version dependent. Ensure that your vendored
8282
// version of 'cluster-policy-controller' is for the same OCP version as your project.
8383
func IsNamespacePSALabelSyncExemptedInVendoredOCPVersion(namespace string) bool {
84-
return systemNSSyncExemptions.Has(namespace)
84+
return systemNSSyncExemptions.Has(namespace)
8585
}

‎staging/operator-lifecycle-manager/test/e2e/downstream_csv_namespace_labeler_plugin_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ var _ = Describe("CSV Namespace Labeler Plugin", func() {
3232
})
3333

3434
It("should not label non openshift- namespaces", func() {
35-
if !olm.IsPluginEnabled(olm.CsvLabelerPluginId) {
35+
if !olm.IsPluginEnabled(olm.CsvLabelerPluginID) {
3636
Skip("csv labeler plugin is disabled")
3737
}
3838

@@ -51,7 +51,7 @@ var _ = Describe("CSV Namespace Labeler Plugin", func() {
5151
})
5252

5353
It("should label a non-payload openshift- namespace", func() {
54-
if !olm.IsPluginEnabled(olm.CsvLabelerPluginId) {
54+
if !olm.IsPluginEnabled(olm.CsvLabelerPluginID) {
5555
Skip("csv labeler plugin is disabled")
5656
}
5757

@@ -70,7 +70,7 @@ var _ = Describe("CSV Namespace Labeler Plugin", func() {
7070
})
7171

7272
It("should relabel a non-payload openshift- namespace containing csvs if the label is deleted", func() {
73-
if !olm.IsPluginEnabled(olm.CsvLabelerPluginId) {
73+
if !olm.IsPluginEnabled(olm.CsvLabelerPluginID) {
7474
Skip("csv labeler plugin is disabled")
7575
}
7676

‎vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/downstream_csv_labeler.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/operator-framework/operator-lifecycle-manager/pkg/controller/operators/olm/downstream_plugins.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)