Skip to content

Commit 3a78692

Browse files
Run make generate
Signed-off-by: Rashmi Gottipati <[email protected]>
1 parent 33e99a9 commit 3a78692

File tree

9 files changed

+125
-191
lines changed

9 files changed

+125
-191
lines changed

testdata/hybrid/memcached-operator/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ CONTROLLER_GEN ?= $(LOCALBIN)/controller-gen
109109
ENVTEST ?= $(LOCALBIN)/setup-envtest
110110

111111
## Tool Versions
112-
KUSTOMIZE_VERSION ?= v4.5.5
113-
CONTROLLER_TOOLS_VERSION ?= v0.9.2
112+
KUSTOMIZE_VERSION ?= v4.5.7
113+
CONTROLLER_TOOLS_VERSION ?= v0.11.1
114114

115115
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
116116
.PHONY: kustomize

testdata/hybrid/memcached-operator/PROJECT

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Code generated by tool. DO NOT EDIT.
2+
# This file is used to track the info used to scaffold your project
3+
# and allow the plugins properly work.
4+
# More info: https://book.kubebuilder.io/reference/project-config.html
15
domain: my.domain
26
layout:
37
- hybrid/v1-alpha

testdata/hybrid/memcached-operator/config/default/manager_auth_proxy_patch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
capabilities:
3232
drop:
3333
- "ALL"
34-
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.0
34+
image: gcr.io/kubebuilder/kube-rbac-proxy:v0.13.1
3535
args:
3636
- "--secure-listen-address=0.0.0.0:8443"
3737
- "--upstream=http://127.0.0.1:8080/"

testdata/hybrid/memcached-operator/config/manager/manager.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ spec:
3737
control-plane: controller-manager
3838
spec:
3939
# TODO(user): Uncomment the following code to configure the nodeAffinity expression
40-
# according to the platforms which are supported by your solution.
40+
# according to the platforms which are supported by your solution.
4141
# It is considered best practice to support multiple architectures. You can
4242
# build your manager image using the makefile target docker-buildx.
4343
# affinity:

testdata/hybrid/memcached-operator/config/prometheus/monitor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ kind: ServiceMonitor
55
metadata:
66
labels:
77
control-plane: controller-manager
8-
app.kubernets.io/name: servicemonitor
8+
app.kubernetes.io/name: servicemonitor
99
app.kubernetes.io/instance: controller-manager-metrics-monitor
1010
app.kubernetes.io/component: metrics
1111
app.kubernetes.io/created-by: memcached-operator

testdata/hybrid/memcached-operator/config/rbac/leader_election_role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ metadata:
88
app.kubernetes.io/component: rbac
99
app.kubernetes.io/created-by: memcached-operator
1010
app.kubernetes.io/part-of: memcached-operator
11-
app.kubernets.io/managed-by: kustomize
11+
app.kubernetes.io/managed-by: kustomize
1212
name: leader-election-role
1313
rules:
1414
- apiGroups:

testdata/hybrid/memcached-operator/controllers/memcached_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ type MemcachedReconciler struct {
4545
// the user.
4646
//
4747
// For more details, check Reconcile and its Result here:
48-
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.13.0/pkg/reconcile
48+
// - https://pkg.go.dev/sigs.k8s.io/controller-runtime@v0.14.1/pkg/reconcile
4949
func (r *MemcachedReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
5050
_ = log.FromContext(ctx)
5151

testdata/hybrid/memcached-operator/go.mod

Lines changed: 35 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,31 +3,22 @@ module github.com/example/memcached-operator
33
go 1.19
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.1.4
7-
github.com/onsi/gomega v1.19.0
6+
github.com/onsi/ginkgo/v2 v2.6.0
7+
github.com/onsi/gomega v1.24.1
88
github.com/operator-framework/helm-operator-plugins v0.0.11
9-
k8s.io/apimachinery v0.25.0
10-
k8s.io/client-go v0.25.0
11-
sigs.k8s.io/controller-runtime v0.13.0
9+
k8s.io/apimachinery v0.26.0
10+
k8s.io/client-go v0.26.0
11+
sigs.k8s.io/controller-runtime v0.14.1
1212
)
1313

1414
require (
15-
cloud.google.com/go v0.99.0 // indirect
1615
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
17-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
18-
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
19-
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
20-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
21-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
22-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
2316
github.com/BurntSushi/toml v1.0.0 // indirect
2417
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd // indirect
2518
github.com/Masterminds/goutils v1.1.1 // indirect
2619
github.com/Masterminds/semver/v3 v3.1.1 // indirect
2720
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
2821
github.com/Masterminds/squirrel v1.5.2 // indirect
29-
github.com/PuerkitoBio/purell v1.1.1 // indirect
30-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
3122
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
3223
github.com/beorn7/perks v1.0.1 // indirect
3324
github.com/cespare/xxhash/v2 v2.1.2 // indirect
@@ -42,28 +33,27 @@ require (
4233
github.com/docker/go-connections v0.4.0 // indirect
4334
github.com/docker/go-metrics v0.0.1 // indirect
4435
github.com/docker/go-units v0.4.0 // indirect
45-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
36+
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
4637
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4738
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4839
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
4940
github.com/fatih/color v1.13.0 // indirect
50-
github.com/fsnotify/fsnotify v1.5.4 // indirect
41+
github.com/fsnotify/fsnotify v1.6.0 // indirect
5142
github.com/go-errors/errors v1.0.1 // indirect
5243
github.com/go-gorp/gorp/v3 v3.0.2 // indirect
5344
github.com/go-logr/logr v1.2.3 // indirect
5445
github.com/go-logr/zapr v1.2.3 // indirect
5546
github.com/go-openapi/jsonpointer v0.19.5 // indirect
56-
github.com/go-openapi/jsonreference v0.19.5 // indirect
47+
github.com/go-openapi/jsonreference v0.20.0 // indirect
5748
github.com/go-openapi/swag v0.19.14 // indirect
5849
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
5950
github.com/gobwas/glob v0.2.3 // indirect
6051
github.com/gogo/protobuf v1.3.2 // indirect
61-
github.com/golang-jwt/jwt/v4 v4.2.0 // indirect
6252
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6353
github.com/golang/protobuf v1.5.2 // indirect
6454
github.com/google/btree v1.0.1 // indirect
6555
github.com/google/gnostic v0.5.7-v3refs // indirect
66-
github.com/google/go-cmp v0.5.8 // indirect
56+
github.com/google/go-cmp v0.5.9 // indirect
6757
github.com/google/gofuzz v1.2.0 // indirect
6858
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
6959
github.com/google/uuid v1.2.0 // indirect
@@ -72,7 +62,7 @@ require (
7262
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
7363
github.com/huandu/xstrings v1.3.2 // indirect
7464
github.com/imdario/mergo v0.3.12 // indirect
75-
github.com/inconshreveable/mousetrap v1.0.0 // indirect
65+
github.com/inconshreveable/mousetrap v1.0.1 // indirect
7666
github.com/jmoiron/sqlx v1.3.4 // indirect
7767
github.com/josharian/intern v1.0.0 // indirect
7868
github.com/json-iterator/go v1.1.12 // indirect
@@ -85,13 +75,13 @@ require (
8575
github.com/mattn/go-colorable v0.1.12 // indirect
8676
github.com/mattn/go-isatty v0.0.14 // indirect
8777
github.com/mattn/go-runewidth v0.0.9 // indirect
88-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
78+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
8979
github.com/mitchellh/copystructure v1.2.0 // indirect
9080
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
9181
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9282
github.com/moby/locker v1.0.1 // indirect
9383
github.com/moby/spdystream v0.2.0 // indirect
94-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
84+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae // indirect
9585
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9686
github.com/modern-go/reflect2 v1.0.2 // indirect
9787
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
@@ -103,53 +93,53 @@ require (
10393
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
10494
github.com/pkg/errors v0.9.1 // indirect
10595
github.com/pmezard/go-difflib v1.0.0 // indirect
106-
github.com/prometheus/client_golang v1.12.2 // indirect
107-
github.com/prometheus/client_model v0.2.0 // indirect
108-
github.com/prometheus/common v0.32.1 // indirect
109-
github.com/prometheus/procfs v0.7.3 // indirect
96+
github.com/prometheus/client_golang v1.14.0 // indirect
97+
github.com/prometheus/client_model v0.3.0 // indirect
98+
github.com/prometheus/common v0.37.0 // indirect
99+
github.com/prometheus/procfs v0.8.0 // indirect
110100
github.com/rubenv/sql-migrate v1.1.1 // indirect
111101
github.com/russross/blackfriday v1.5.2 // indirect
112102
github.com/sergi/go-diff v1.1.0 // indirect
113103
github.com/shopspring/decimal v1.2.0 // indirect
114104
github.com/sirupsen/logrus v1.8.1 // indirect
115105
github.com/spf13/cast v1.4.1 // indirect
116-
github.com/spf13/cobra v1.4.0 // indirect
106+
github.com/spf13/cobra v1.6.0 // indirect
117107
github.com/spf13/pflag v1.0.5 // indirect
118-
github.com/stretchr/testify v1.7.1 // indirect
108+
github.com/stretchr/testify v1.8.0 // indirect
119109
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
120110
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
121111
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
122112
github.com/xlab/treeprint v0.0.0-20181112141820-a009c3971eca // indirect
123113
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
124114
go.uber.org/atomic v1.7.0 // indirect
125115
go.uber.org/multierr v1.6.0 // indirect
126-
go.uber.org/zap v1.21.0 // indirect
127-
golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd // indirect
128-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
129-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
116+
go.uber.org/zap v1.24.0 // indirect
117+
golang.org/x/crypto v0.1.0 // indirect
118+
golang.org/x/net v0.3.1-0.20221206200815-1e63c2f08a10 // indirect
119+
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
130120
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
131-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
132-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
133-
golang.org/x/text v0.3.7 // indirect
134-
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
121+
golang.org/x/sys v0.3.0 // indirect
122+
golang.org/x/term v0.3.0 // indirect
123+
golang.org/x/text v0.5.0 // indirect
124+
golang.org/x/time v0.3.0 // indirect
135125
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
136126
google.golang.org/appengine v1.6.7 // indirect
137127
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
138-
google.golang.org/grpc v1.47.0 // indirect
139-
google.golang.org/protobuf v1.28.0 // indirect
128+
google.golang.org/grpc v1.49.0 // indirect
129+
google.golang.org/protobuf v1.28.1 // indirect
140130
gopkg.in/inf.v0 v0.9.1 // indirect
141131
gopkg.in/yaml.v2 v2.4.0 // indirect
142132
gopkg.in/yaml.v3 v3.0.1 // indirect
143133
helm.sh/helm/v3 v3.9.0 // indirect
144-
k8s.io/api v0.25.0 // indirect
145-
k8s.io/apiextensions-apiserver v0.25.0 // indirect
146-
k8s.io/apiserver v0.25.0 // indirect
134+
k8s.io/api v0.26.0 // indirect
135+
k8s.io/apiextensions-apiserver v0.26.0 // indirect
136+
k8s.io/apiserver v0.26.0 // indirect
147137
k8s.io/cli-runtime v0.24.0 // indirect
148-
k8s.io/component-base v0.25.0 // indirect
149-
k8s.io/klog/v2 v2.70.1 // indirect
150-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
138+
k8s.io/component-base v0.26.0 // indirect
139+
k8s.io/klog/v2 v2.80.1 // indirect
140+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
151141
k8s.io/kubectl v0.24.0 // indirect
152-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
142+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
153143
oras.land/oras-go v1.1.0 // indirect
154144
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
155145
sigs.k8s.io/kustomize/api v0.11.4 // indirect

0 commit comments

Comments
 (0)