Skip to content

Commit 7ff27e0

Browse files
zreigzzreigz
authored
feat: add constraint controller (#144)
* add constarin controller * register controller * add console client * feed API * gofmt * bump polly * fix a typo * add client mocks * fix conflict
1 parent 28612f2 commit 7ff27e0

File tree

8 files changed

+631
-462
lines changed

8 files changed

+631
-462
lines changed

‎cmd/main.go

+15
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ package main
33
import (
44
"os"
55

6+
templatesv1 "github.com/open-policy-agent/frameworks/constraint/pkg/apis/templates/v1"
7+
constraintstatusv1beta1 "github.com/open-policy-agent/gatekeeper/v3/apis/status/v1beta1"
68
deploymentsv1alpha1 "github.com/pluralsh/deployment-operator/api/v1alpha1"
79
"github.com/pluralsh/deployment-operator/internal/controller"
810
"github.com/pluralsh/deployment-operator/pkg/client"
@@ -27,6 +29,8 @@ func init() {
2729
utilruntime.Must(deploymentsv1alpha1.AddToScheme(scheme))
2830
utilruntime.Must(velerov1.AddToScheme(scheme))
2931
utilruntime.Must(apiextensionsv1.AddToScheme(scheme))
32+
utilruntime.Must(constraintstatusv1beta1.AddToScheme(scheme))
33+
utilruntime.Must(templatesv1.AddToScheme(scheme))
3034
//+kubebuilder:scaffold:scheme
3135
}
3236

@@ -59,6 +63,12 @@ func main() {
5963
Scheme: mgr.GetScheme(),
6064
ConsoleClient: ctrlMgr.GetClient(),
6165
}
66+
constraintController := &controller.ConstraintReconciler{
67+
Client: mgr.GetClient(),
68+
Scheme: mgr.GetScheme(),
69+
ConsoleClient: ctrlMgr.GetClient(),
70+
Reader: mgr.GetCache(),
71+
}
6272

6373
reconcileGroups := map[schema.GroupVersionKind]controller.SetupWithManager{
6474
{
@@ -71,6 +81,11 @@ func main() {
7181
Version: velerov1.SchemeGroupVersion.Version,
7282
Kind: "Restore",
7383
}: restoreController.SetupWithManager,
84+
{
85+
Group: "status.gatekeeper.sh",
86+
Version: "v1beta1",
87+
Kind: "ConstraintPodStatus",
88+
}: constraintController.SetupWithManager,
7489
}
7590

7691
if err = (&controller.CrdRegisterControllerReconciler{

‎go.mod

+82-62
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,46 @@ require (
66
github.com/Masterminds/semver/v3 v3.2.1
77
github.com/Masterminds/sprig/v3 v3.2.3
88
github.com/Yamashou/gqlgenc v0.18.1
9-
github.com/evanphx/json-patch v5.6.0+incompatible
9+
github.com/evanphx/json-patch v5.7.0+incompatible
1010
github.com/fluxcd/flagger v1.35.0
1111
github.com/gin-gonic/gin v1.7.7
12-
github.com/go-logr/logr v1.3.0
12+
github.com/go-logr/logr v1.4.1
1313
github.com/gofrs/flock v0.8.1
1414
github.com/mitchellh/mapstructure v1.5.0
15-
github.com/onsi/ginkgo/v2 v2.12.1
16-
github.com/onsi/gomega v1.27.10
15+
github.com/onsi/ginkgo/v2 v2.14.0
16+
github.com/onsi/gomega v1.30.0
17+
github.com/open-policy-agent/frameworks/constraint v0.0.0-20240110234408-18fa1fc7dc06
18+
github.com/open-policy-agent/gatekeeper/v3 v3.15.1
1719
github.com/orcaman/concurrent-map/v2 v2.0.1
1820
github.com/osteele/liquid v1.3.2
1921
github.com/pkg/errors v0.9.1
2022
github.com/pluralsh/console-client-go v0.1.8
2123
github.com/pluralsh/controller-reconcile-helper v0.0.4
2224
github.com/pluralsh/gophoenix v0.1.3-0.20231201014135-dff1b4309e34
23-
github.com/pluralsh/polly v0.1.6
25+
github.com/pluralsh/polly v0.1.7
2426
github.com/samber/lo v1.39.0
2527
github.com/spf13/pflag v1.0.5
2628
github.com/stretchr/testify v1.8.4
2729
github.com/vektra/mockery/v2 v2.39.0
2830
github.com/vmware-tanzu/velero v1.13.0
2931
github.com/yuin/gopher-lua v1.1.1
3032
go.uber.org/zap v1.26.0
31-
golang.org/x/net v0.18.0
32-
helm.sh/helm/v3 v3.11.2
33-
k8s.io/api v0.27.7
34-
k8s.io/apiextensions-apiserver v0.27.7
35-
k8s.io/apimachinery v0.27.7
36-
k8s.io/cli-runtime v0.26.0
37-
k8s.io/client-go v0.27.7
33+
golang.org/x/net v0.19.0
34+
helm.sh/helm/v3 v3.14.3
35+
k8s.io/api v0.29.2
36+
k8s.io/apiextensions-apiserver v0.29.0
37+
k8s.io/apimachinery v0.29.2
38+
k8s.io/cli-runtime v0.29.2
39+
k8s.io/client-go v0.29.2
3840
k8s.io/klog/v2 v2.110.1
39-
k8s.io/kubectl v0.26.0
41+
k8s.io/kubectl v0.29.2
4042
layeh.com/gopher-luar v1.0.11
41-
sigs.k8s.io/cli-utils v0.35.0
42-
sigs.k8s.io/controller-runtime v0.15.3
43-
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20231215020716-1b80b9629af8
44-
sigs.k8s.io/kustomize/kustomize/v4 v4.5.7
45-
sigs.k8s.io/kustomize/kyaml v0.13.9
46-
sigs.k8s.io/yaml v1.3.0
43+
sigs.k8s.io/cli-utils v0.35.1-0.20240103002740-7928dbf3d402
44+
sigs.k8s.io/controller-runtime v0.17.2
45+
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240313184151-cb5107b36b64
46+
sigs.k8s.io/kustomize/kustomize/v5 v5.0.4-0.20230601165947-6ce0bf390ce3
47+
sigs.k8s.io/kustomize/kyaml v0.16.0
48+
sigs.k8s.io/yaml v1.4.0
4749

4850
)
4951

@@ -53,37 +55,44 @@ require (
5355

5456
require (
5557
github.com/99designs/gqlgen v0.17.43 // indirect
58+
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect
5659
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
57-
github.com/BurntSushi/toml v1.2.1 // indirect
60+
github.com/BurntSushi/toml v1.3.2 // indirect
5861
github.com/MakeNowJust/heredoc v1.0.0 // indirect
5962
github.com/Masterminds/goutils v1.1.1 // indirect
60-
github.com/Masterminds/squirrel v1.5.3 // indirect
61-
github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 // indirect
63+
github.com/Masterminds/squirrel v1.5.4 // indirect
64+
github.com/Microsoft/hcsshim v0.11.4 // indirect
65+
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
66+
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
6267
github.com/beorn7/perks v1.0.1 // indirect
68+
github.com/blang/semver/v4 v4.0.0 // indirect
6369
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
6470
github.com/cespare/xxhash/v2 v2.2.0 // indirect
6571
github.com/chai2010/gettext-go v1.0.2 // indirect
6672
github.com/chigopher/pathlib v0.19.1 // indirect
67-
github.com/containerd/containerd v1.6.15 // indirect
68-
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
73+
github.com/containerd/containerd v1.7.12 // indirect
74+
github.com/containerd/log v0.1.0 // indirect
75+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
6976
github.com/davecgh/go-spew v1.1.1 // indirect
70-
github.com/docker/cli v20.10.21+incompatible // indirect
71-
github.com/docker/distribution v2.8.1+incompatible // indirect
72-
github.com/docker/docker v20.10.21+incompatible // indirect
77+
github.com/docker/cli v24.0.6+incompatible // indirect
78+
github.com/docker/distribution v2.8.2+incompatible // indirect
79+
github.com/docker/docker v24.0.7+incompatible // indirect
7380
github.com/docker/docker-credential-helpers v0.7.0 // indirect
7481
github.com/docker/go-connections v0.4.0 // indirect
7582
github.com/docker/go-metrics v0.0.1 // indirect
76-
github.com/docker/go-units v0.4.0 // indirect
77-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
78-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
83+
github.com/docker/go-units v0.5.0 // indirect
84+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
85+
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
7986
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
8087
github.com/fatih/camelcase v1.0.0 // indirect
8188
github.com/fatih/color v1.15.0 // indirect
82-
github.com/fsnotify/fsnotify v1.6.0 // indirect
83-
github.com/fvbommel/sortorder v1.0.1 // indirect
89+
github.com/felixge/httpsnoop v1.0.4 // indirect
90+
github.com/fsnotify/fsnotify v1.7.0 // indirect
91+
github.com/fvbommel/sortorder v1.1.0 // indirect
8492
github.com/gin-contrib/sse v0.1.0 // indirect
8593
github.com/go-errors/errors v1.4.2 // indirect
86-
github.com/go-gorp/gorp/v3 v3.0.5 // indirect
94+
github.com/go-gorp/gorp/v3 v3.1.0 // indirect
95+
github.com/go-logr/stdr v1.2.2 // indirect
8796
github.com/go-logr/zapr v1.3.0 // indirect
8897
github.com/go-openapi/jsonpointer v0.19.6 // indirect
8998
github.com/go-openapi/jsonreference v0.20.2 // indirect
@@ -97,16 +106,19 @@ require (
97106
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
98107
github.com/golang/protobuf v1.5.3 // indirect
99108
github.com/google/btree v1.0.1 // indirect
100-
github.com/google/gnostic v0.6.9 // indirect
109+
github.com/google/cel-go v0.17.7 // indirect
110+
github.com/google/gnostic-models v0.6.8 // indirect
101111
github.com/google/go-cmp v0.6.0 // indirect
102112
github.com/google/gofuzz v1.2.0 // indirect
103113
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
104114
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
105115
github.com/google/uuid v1.6.0 // indirect
106-
github.com/gorilla/mux v1.8.0 // indirect
116+
github.com/gorilla/mux v1.8.1 // indirect
107117
github.com/gorilla/websocket v1.5.0 // indirect
108118
github.com/gosuri/uitable v0.0.4 // indirect
109119
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
120+
github.com/hashicorp/errwrap v1.1.0 // indirect
121+
github.com/hashicorp/go-multierror v1.1.1 // indirect
110122
github.com/hashicorp/hcl v1.0.0 // indirect
111123
github.com/huandu/xstrings v1.4.0 // indirect
112124
github.com/iancoleman/strcase v0.2.0 // indirect
@@ -124,86 +136,94 @@ require (
124136
github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
125137
github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
126138
github.com/leodido/go-urn v1.2.0 // indirect
127-
github.com/lib/pq v1.10.7 // indirect
139+
github.com/lib/pq v1.10.9 // indirect
128140
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
129141
github.com/magiconair/properties v1.8.7 // indirect
130142
github.com/mailru/easyjson v0.7.7 // indirect
131143
github.com/mattn/go-colorable v0.1.13 // indirect
132144
github.com/mattn/go-isatty v0.0.20 // indirect
133145
github.com/mattn/go-runewidth v0.0.13 // indirect
134-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
146+
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
135147
github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
136148
github.com/mitchellh/copystructure v1.2.0 // indirect
137149
github.com/mitchellh/go-homedir v1.1.0 // indirect
138-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
150+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
139151
github.com/mitchellh/reflectwalk v1.0.2 // indirect
140152
github.com/moby/locker v1.0.1 // indirect
141153
github.com/moby/spdystream v0.2.0 // indirect
142-
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
154+
github.com/moby/term v0.5.0 // indirect
143155
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
144156
github.com/modern-go/reflect2 v1.0.2 // indirect
145157
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
146158
github.com/morikuni/aec v1.0.0 // indirect
147159
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
160+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
148161
github.com/opencontainers/go-digest v1.0.0 // indirect
149-
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
162+
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
150163
github.com/osteele/tuesday v1.0.3 // indirect
151164
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
152165
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
153166
github.com/pmezard/go-difflib v1.0.0 // indirect
154-
github.com/prometheus/client_golang v1.17.0 // indirect
167+
github.com/prometheus/client_golang v1.18.0 // indirect
155168
github.com/prometheus/client_model v0.5.0 // indirect
156-
github.com/prometheus/common v0.44.0 // indirect
157-
github.com/prometheus/procfs v0.11.1 // indirect
169+
github.com/prometheus/common v0.45.0 // indirect
170+
github.com/prometheus/procfs v0.12.0 // indirect
158171
github.com/rivo/uniseg v0.4.7 // indirect
159172
github.com/rs/zerolog v1.29.0 // indirect
160-
github.com/rubenv/sql-migrate v1.3.1 // indirect
173+
github.com/rubenv/sql-migrate v1.5.2 // indirect
161174
github.com/russross/blackfriday/v2 v2.1.0 // indirect
162175
github.com/schollz/progressbar/v3 v3.14.1 // indirect
163176
github.com/shopspring/decimal v1.3.1 // indirect
164177
github.com/sirupsen/logrus v1.9.3 // indirect
165178
github.com/sosodev/duration v1.2.0 // indirect
166179
github.com/spf13/afero v1.9.3 // indirect
167180
github.com/spf13/cast v1.5.0 // indirect
168-
github.com/spf13/cobra v1.6.1 // indirect
181+
github.com/spf13/cobra v1.8.0 // indirect
169182
github.com/spf13/jwalterweatherman v1.1.0 // indirect
170183
github.com/spf13/viper v1.15.0 // indirect
171-
github.com/spyzhov/ajson v0.7.2 // indirect
184+
github.com/spyzhov/ajson v0.9.0 // indirect
185+
github.com/stoewer/go-strcase v1.2.0 // indirect
172186
github.com/stretchr/objx v0.5.0 // indirect
173187
github.com/subosito/gotenv v1.4.2 // indirect
174188
github.com/ugorji/go/codec v1.1.7 // indirect
175189
github.com/vektah/gqlparser/v2 v2.5.11 // indirect
176-
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect
190+
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
177191
github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
178192
github.com/xeipuuv/gojsonschema v1.2.0 // indirect
179-
github.com/xlab/treeprint v1.1.0 // indirect
180-
go.starlark.net v0.0.0-20201006213952-227f4aabceb5 // indirect
193+
github.com/xlab/treeprint v1.2.0 // indirect
194+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
195+
go.opentelemetry.io/otel v1.21.0 // indirect
196+
go.opentelemetry.io/otel/metric v1.21.0 // indirect
197+
go.opentelemetry.io/otel/trace v1.21.0 // indirect
198+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
181199
go.uber.org/multierr v1.11.0 // indirect
182200
golang.org/x/crypto v0.17.0 // indirect
183-
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
184-
golang.org/x/mod v0.13.0 // indirect
201+
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
202+
golang.org/x/mod v0.14.0 // indirect
185203
golang.org/x/oauth2 v0.14.0 // indirect
186204
golang.org/x/sync v0.5.0 // indirect
187205
golang.org/x/sys v0.17.0 // indirect
188206
golang.org/x/term v0.17.0 // indirect
189207
golang.org/x/text v0.14.0 // indirect
190208
golang.org/x/time v0.5.0 // indirect
191-
golang.org/x/tools v0.13.0 // indirect
192-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
193-
google.golang.org/appengine v1.6.7 // indirect
209+
golang.org/x/tools v0.16.1 // indirect
210+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
211+
google.golang.org/appengine v1.6.8 // indirect
212+
google.golang.org/genproto/googleapis/api v0.0.0-20231120223509-83a465c0220f // indirect
194213
google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect
195-
google.golang.org/grpc v1.59.0 // indirect
214+
google.golang.org/grpc v1.60.1 // indirect
196215
google.golang.org/protobuf v1.31.0 // indirect
216+
gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
197217
gopkg.in/inf.v0 v0.9.1 // indirect
198218
gopkg.in/ini.v1 v1.67.0 // indirect
199219
gopkg.in/yaml.v2 v2.4.0 // indirect
200220
gopkg.in/yaml.v3 v3.0.1 // indirect
201-
k8s.io/apiserver v0.27.7 // indirect
202-
k8s.io/component-base v0.27.7 // indirect
203-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
204-
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
205-
oras.land/oras-go v1.2.2 // indirect
221+
k8s.io/apiserver v0.29.0 // indirect
222+
k8s.io/component-base v0.29.2 // indirect
223+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
224+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
225+
oras.land/oras-go v1.2.4 // indirect
206226
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
207-
sigs.k8s.io/kustomize/api v0.12.1 // indirect
208-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
227+
sigs.k8s.io/kustomize/api v0.16.0 // indirect
228+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
209229
)

0 commit comments

Comments
 (0)