Skip to content

Commit dd5eaf6

Browse files
authored
MGMT-18829: Convert agent-install CRDs to new webhook (#6882)
* MGMT-18829: Initial webhook scaffolding Files generated or modified to build a webhook using https://sdk.operatorframework.io/docs/building-operators/golang/webhook/ instead of using Kube's aggregate API Server. * MGMT-18829: Create new Agent webhook Move old Agent webhook logic into new webhook files. * MGMT-18829: Create new InfraEnv webhook Move old InfraEnv webhook logic into new webhook files. * MGMT-18829: Create new AgentClassification webhook Move old AgentClassification webhook logic into new webhook files. * MGMT-18829: Generate vendor files * MGMT-18829: Upgrade controller-gen and operator-sdk version Controller-gen to 0.14.0 (still uses go 1.21) Operator-sdk 1.25.2 - latest is 1.37.0, but due to this issue operator-framework/operator-sdk#6285 The changes in this PR operator-framework/operator-sdk#6136 modifies the "createdAt" timestamp whenever the olm bundle is generated. This fails our CI test to verify generated files due to the diff each time it's ran. So we want to use an operator-sdk version prior to this change, which is 1.25.2 * MGMT-18829: Regenerate files after upgrade Run `skipper make generate`
1 parent 0d91284 commit dd5eaf6

File tree

3,444 files changed

+1135754
-3567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,444 files changed

+1135754
-3567
lines changed

PROJECT

+45-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
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: openshift.io
2-
layout: go.kubebuilder.io/v3
6+
layout:
7+
- go.kubebuilder.io/v3
8+
plugins:
9+
manifests.sdk.operatorframework.io/v2: {}
10+
scorecard.sdk.operatorframework.io/v2: {}
311
projectName: assisted-service-operator
412
repo: github.com/openshift/assisted-service
513
resources:
@@ -11,7 +19,40 @@ resources:
1119
kind: AgentServiceConfig
1220
path: github.com/openshift/assisted-service/api/v1beta1
1321
version: v1beta1
22+
- api:
23+
crdVersion: v1beta1
24+
namespaced: true
25+
controller: true
26+
domain: openshift.io
27+
group: agent-install
28+
kind: Agent
29+
path: github.com/openshift/assisted-service/api/v1beta1
30+
version: v1beta1
31+
webhooks:
32+
validation: true
33+
webhookVersion: v1
34+
- api:
35+
crdVersion: v1beta1
36+
namespaced: true
37+
controller: true
38+
domain: openshift.io
39+
group: agent-install
40+
kind: InfraEnv
41+
path: github.com/openshift/assisted-service/api/v1beta1
42+
version: v1beta1
43+
webhooks:
44+
validation: true
45+
webhookVersion: v1
46+
- api:
47+
crdVersion: v1beta1
48+
namespaced: true
49+
controller: true
50+
domain: openshift.io
51+
group: agent-install
52+
kind: AgentClassification
53+
path: github.com/openshift/assisted-service/api/v1beta1
54+
version: v1beta1
55+
webhooks:
56+
validation: true
57+
webhookVersion: v1
1458
version: "3"
15-
plugins:
16-
manifests.sdk.operatorframework.io/v2: {}
17-
scorecard.sdk.operatorframework.io/v2: {}

api/common/zz_generated.deepcopy.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/go.mod

+44-3
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,30 @@ module github.com/openshift/assisted-service/api
33
go 1.21
44

55
require (
6+
github.com/itchyny/gojq v0.12.8
7+
github.com/onsi/ginkgo v1.16.5
8+
github.com/onsi/gomega v1.30.0
69
github.com/openshift/assisted-service/models v0.0.0
710
github.com/openshift/custom-resource-status v1.1.3-0.20220503160415-f2fdb4999d87
811
github.com/openshift/hive/apis v0.0.0-20231220215202-ad99b9e52d27
12+
github.com/thoas/go-funk v0.9.2
913
k8s.io/api v0.29.5
1014
k8s.io/apimachinery v0.29.5
15+
k8s.io/client-go v0.29.2
1116
sigs.k8s.io/controller-runtime v0.13.1
12-
sigs.k8s.io/yaml v1.3.0
17+
sigs.k8s.io/yaml v1.4.0
1318
)
1419

1520
require (
1621
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
17-
github.com/go-logr/logr v1.3.0 // indirect
22+
github.com/beorn7/perks v1.0.1 // indirect
23+
github.com/cespare/xxhash/v2 v2.2.0 // indirect
24+
github.com/davecgh/go-spew v1.1.1 // indirect
25+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
26+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
27+
github.com/fsnotify/fsnotify v1.7.0 // indirect
28+
github.com/go-logr/logr v1.4.1 // indirect
29+
github.com/go-logr/zapr v1.3.0 // indirect
1830
github.com/go-openapi/analysis v0.21.2 // indirect
1931
github.com/go-openapi/errors v0.20.3 // indirect
2032
github.com/go-openapi/jsonpointer v0.19.6 // indirect
@@ -25,29 +37,57 @@ require (
2537
github.com/go-openapi/swag v0.22.3 // indirect
2638
github.com/go-openapi/validate v0.22.0 // indirect
2739
github.com/gogo/protobuf v1.3.2 // indirect
40+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
41+
github.com/golang/protobuf v1.5.4 // indirect
42+
github.com/google/gnostic-models v0.6.8 // indirect
43+
github.com/google/go-cmp v0.6.0 // indirect
2844
github.com/google/gofuzz v1.2.0 // indirect
45+
github.com/google/uuid v1.3.0 // indirect
46+
github.com/imdario/mergo v0.3.12 // indirect
47+
github.com/itchyny/timefmt-go v0.1.3 // indirect
2948
github.com/jinzhu/inflection v1.0.0 // indirect
3049
github.com/jinzhu/now v1.1.4 // indirect
3150
github.com/josharian/intern v1.0.0 // indirect
3251
github.com/json-iterator/go v1.1.12 // indirect
3352
github.com/lib/pq v1.10.9 // indirect
3453
github.com/mailru/easyjson v0.7.7 // indirect
54+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
3555
github.com/mitchellh/mapstructure v1.5.0 // indirect
3656
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3757
github.com/modern-go/reflect2 v1.0.2 // indirect
58+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
59+
github.com/nxadm/tail v1.4.8 // indirect
3860
github.com/oklog/ulid v1.3.1 // indirect
3961
github.com/openshift/api v0.0.0-20230720094506-afcbe27aec7c // indirect
4062
github.com/openshift/assisted-service v1.0.10-0.20230830164851-6573b5d7021d // indirect
4163
github.com/pkg/errors v0.9.1 // indirect
42-
github.com/thoas/go-funk v0.9.2 // indirect
64+
github.com/prometheus/client_golang v1.18.0 // indirect
65+
github.com/prometheus/client_model v0.5.0 // indirect
66+
github.com/prometheus/common v0.45.0 // indirect
67+
github.com/prometheus/procfs v0.12.0 // indirect
68+
github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace // indirect
4369
go.mongodb.org/mongo-driver v1.10.0 // indirect
70+
go.uber.org/multierr v1.11.0 // indirect
71+
go.uber.org/zap v1.26.0 // indirect
72+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
4473
golang.org/x/net v0.23.0 // indirect
74+
golang.org/x/oauth2 v0.12.0 // indirect
75+
golang.org/x/sys v0.19.0 // indirect
76+
golang.org/x/term v0.19.0 // indirect
4577
golang.org/x/text v0.14.0 // indirect
78+
golang.org/x/time v0.3.0 // indirect
79+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
80+
google.golang.org/appengine v1.6.7 // indirect
81+
google.golang.org/protobuf v1.33.0 // indirect
4682
gopkg.in/inf.v0 v0.9.1 // indirect
83+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
4784
gopkg.in/yaml.v2 v2.4.0 // indirect
4885
gopkg.in/yaml.v3 v3.0.1 // indirect
4986
gorm.io/gorm v1.24.5 // indirect
87+
k8s.io/apiextensions-apiserver v0.29.2 // indirect
88+
k8s.io/component-base v0.29.2 // indirect
5089
k8s.io/klog/v2 v2.110.1 // indirect
90+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
5191
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
5292
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
5393
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
@@ -56,4 +96,5 @@ require (
5696
replace (
5797
github.com/openshift/assisted-service/models => ../models
5898
golang.org/x/net => golang.org/x/net v0.24.0
99+
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.17.3
59100
)

0 commit comments

Comments
 (0)