Skip to content

Commit 85b5cb9

Browse files
authored
update packages for twistlock (#239)
* update packages for twistlock Signed-off-by: Ben Luzarraga <[email protected]> * update controller runtime package Signed-off-by: Ben Luzarraga <[email protected]> * troubleshoot pkg difficulties Signed-off-by: Ben Luzarraga <[email protected]> * troubleshoot pkg difficulties Signed-off-by: Ben Luzarraga <[email protected]> * troubleshoot pkg difficulties Signed-off-by: Ben Luzarraga <[email protected]> * troubleshoot pkg difficulties Signed-off-by: Ben Luzarraga <[email protected]> --------- Signed-off-by: Ben Luzarraga <[email protected]>
1 parent 4773bb5 commit 85b5cb9

File tree

3 files changed

+215
-68
lines changed

3 files changed

+215
-68
lines changed

controllers/common/util.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ package common
1818

1919
import (
2020
"fmt"
21-
"io/ioutil"
2221
"os"
2322
"sort"
2423
"strings"
@@ -114,7 +113,7 @@ func Reverse(original []string) []string {
114113
func GetOperatorNamespace() (string, error) {
115114
ns, found := os.LookupEnv("OPERATOR_NAMESPACE")
116115
if !found {
117-
nsBytes, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
116+
nsBytes, err := os.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
118117
if err != nil {
119118
if os.IsNotExist(err) {
120119
return "", fmt.Errorf("namespace not found for current environment")

go.mod

Lines changed: 32 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,76 @@
11
module github.com/IBM/ibm-namespace-scope-operator
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/IBM/controller-filtered-cache v0.2.1
77
github.com/deckarep/golang-set v1.7.1
88
github.com/onsi/ginkgo v1.12.1
99
github.com/onsi/gomega v1.10.1
1010
github.com/operator-framework/api v0.3.20
11-
k8s.io/api v0.18.6
12-
k8s.io/apimachinery v0.18.6
13-
k8s.io/client-go v0.18.6
11+
k8s.io/api v0.20.0-alpha.2
12+
k8s.io/apimachinery v0.20.0-alpha.2
13+
k8s.io/client-go v0.20.0-alpha.2
1414
k8s.io/klog v1.0.0
1515
sigs.k8s.io/controller-runtime v0.6.2
1616
)
1717

18-
require golang.org/x/term v0.0.0-20201117132131-f5c789dd3221 // indirect
18+
require golang.org/x/term v0.5.0 // indirect
1919

2020
require (
21-
cloud.google.com/go v0.38.0 // indirect
21+
cloud.google.com/go v0.51.0 // indirect
2222
github.com/beorn7/perks v1.0.1 // indirect
2323
github.com/blang/semver v3.5.0+incompatible // indirect
24+
github.com/cespare/xxhash/v2 v2.1.1 // indirect
2425
github.com/davecgh/go-spew v1.1.1 // indirect
25-
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
26+
github.com/evanphx/json-patch v4.9.0+incompatible // indirect
2627
github.com/fsnotify/fsnotify v1.4.9 // indirect
27-
github.com/go-logr/logr v0.1.0 // indirect
28-
github.com/go-logr/zapr v0.1.0 // indirect
28+
github.com/go-logr/logr v0.2.1 // indirect
29+
github.com/go-logr/zapr v0.2.0 // indirect
2930
github.com/gobuffalo/flect v0.2.0 // indirect
3031
github.com/gogo/protobuf v1.3.1 // indirect
31-
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef // indirect
32-
github.com/golang/protobuf v1.4.2 // indirect
33-
github.com/google/go-cmp v0.4.0 // indirect
32+
github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7 // indirect
33+
github.com/golang/protobuf v1.4.3 // indirect
34+
github.com/google/go-cmp v0.5.5 // indirect
3435
github.com/google/gofuzz v1.1.0 // indirect
3536
github.com/google/uuid v1.1.1 // indirect
36-
github.com/googleapis/gnostic v0.3.1 // indirect
37+
github.com/googleapis/gnostic v0.4.1 // indirect
3738
github.com/hashicorp/golang-lru v0.5.4 // indirect
3839
github.com/imdario/mergo v0.3.9 // indirect
39-
github.com/json-iterator/go v1.1.10 // indirect
40-
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
40+
github.com/json-iterator/go v1.1.11 // indirect
41+
github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect
4142
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
4243
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4344
github.com/modern-go/reflect2 v1.0.1 // indirect
4445
github.com/nxadm/tail v1.4.4 // indirect
4546
github.com/pkg/errors v0.9.1 // indirect
46-
github.com/prometheus/client_golang v1.1.0 // indirect
47+
github.com/prometheus/client_golang v1.11.0 // indirect
4748
github.com/prometheus/client_model v0.2.0 // indirect
48-
github.com/prometheus/common v0.6.0 // indirect
49-
github.com/prometheus/procfs v0.0.11 // indirect
50-
github.com/sirupsen/logrus v1.4.2 // indirect
49+
github.com/prometheus/common v0.26.0 // indirect
50+
github.com/prometheus/procfs v0.6.0 // indirect
51+
github.com/sirupsen/logrus v1.6.0 // indirect
5152
github.com/spf13/pflag v1.0.5 // indirect
5253
go.uber.org/atomic v1.4.0 // indirect
5354
go.uber.org/multierr v1.1.0 // indirect
5455
go.uber.org/zap v1.10.0 // indirect
55-
golang.org/x/crypto v0.0.0-20201216223049-8b5274cf687f // indirect
56-
golang.org/x/net v0.0.0-20201021035429-f5854403a974 // indirect
57-
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
58-
golang.org/x/sys v0.0.0-20220422013727-9388b58f7150 // indirect
59-
golang.org/x/text v0.3.3 // indirect
60-
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
56+
golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b // indirect
57+
golang.org/x/net v0.7.0 // indirect
58+
golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6 // indirect
59+
golang.org/x/sys v0.5.0 // indirect
60+
golang.org/x/text v0.7.0 // indirect
61+
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
6162
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
6263
gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect
63-
google.golang.org/appengine v1.5.0 // indirect
64-
google.golang.org/protobuf v1.23.0 // indirect
64+
google.golang.org/appengine v1.6.5 // indirect
65+
google.golang.org/protobuf v1.26.0-rc.1 // indirect
6566
gopkg.in/inf.v0 v0.9.1 // indirect
6667
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
6768
gopkg.in/yaml.v2 v2.3.0 // indirect
6869
k8s.io/apiextensions-apiserver v0.18.6 // indirect
69-
k8s.io/klog/v2 v2.0.0 // indirect
70-
k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 // indirect
71-
k8s.io/utils v0.0.0-20200603063816-c1c6865ac451 // indirect
72-
sigs.k8s.io/structured-merge-diff/v3 v3.0.0 // indirect
70+
k8s.io/klog/v2 v2.2.0 // indirect
71+
k8s.io/kube-openapi v0.0.0-20200923155610-8b5066479488 // indirect
72+
k8s.io/utils v0.0.0-20200729134348-d5654de09c73 // indirect
73+
sigs.k8s.io/structured-merge-diff/v4 v4.0.2-0.20201001033253-b3cf1e8ff931 // indirect
7374
sigs.k8s.io/yaml v1.2.0 // indirect
7475
)
7576

0 commit comments

Comments
 (0)