Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
Signed-off-by: Sertac Ozercan <[email protected]>
  • Loading branch information
sozercan committed Dec 7, 2022
1 parent faa5bac commit 020ccff
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 40 deletions.
14 changes: 9 additions & 5 deletions constraint/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@ install: manifests

# Install the generation dependencies on the local machine
gen-dependencies:
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
go install k8s.io/code-generator/cmd/conversion-gen@v0.23.3
go install k8s.io/code-generator/cmd/defaulter-gen@v0.23.3
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10.0
go install k8s.io/code-generator/cmd/conversion-gen@v0.25.4
go install k8s.io/code-generator/cmd/defaulter-gen@v0.25.4

# Generate manifests e.g. CRD, RBAC etc.
manifests:
Expand Down Expand Up @@ -74,11 +74,15 @@ generate: generate-defaults
# those functions exist and can be added manually to the conversion file.
# TODO: Once https://github.com/kubernetes/kubernetes/issues/101567 is fixed, update
# conversion-gen and get us back to running `make generate` in our CI pipeline
# conversion-gen \
# --input-dirs "./pkg/apis/templates/...,./pkg/apis/externaldata/..." \
# --go-header-file=./hack/boilerplate.go.txt \
# --output-file-base=zz_generated.conversion \
# --extra-dirs=k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1
conversion-gen \
--input-dirs "./pkg/apis/templates/..,./pkg/apis/externaldata/..." \
--input-dirs "./pkg/apis/externaldata/..." \
--go-header-file=./hack/boilerplate.go.txt \
--output-file-base=zz_generated.conversion \
--extra-dirs=k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1

CRD_SOURCE_FILE := deploy/crds.yaml
FILE_STUB := "package schema\
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: providers.externaldata.gatekeeper.sh
spec:
Expand Down Expand Up @@ -95,9 +95,3 @@ spec:
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: constrainttemplates.templates.gatekeeper.sh
spec:
Expand Down Expand Up @@ -324,9 +324,3 @@ spec:
storage: false
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
16 changes: 2 additions & 14 deletions constraint/deploy/crds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.10.0
name: constrainttemplates.templates.gatekeeper.sh
spec:
group: templates.gatekeeper.sh
Expand Down Expand Up @@ -299,18 +299,12 @@ spec:
storage: false
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.10.0
creationTimestamp: null
name: providers.externaldata.gatekeeper.sh
spec:
Expand Down Expand Up @@ -386,9 +380,3 @@ spec:
type: object
served: true
storage: true
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
1 change: 1 addition & 0 deletions constraint/pkg/apis/templates/v1/zz_generated.defaults.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 1 addition & 7 deletions constraint/pkg/schema/yaml_constant.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const constraintTemplateCRDYaml = `apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
controller-gen.kubebuilder.io/version: v0.10.0
name: constrainttemplates.templates.gatekeeper.sh
spec:
group: templates.gatekeeper.sh
Expand Down Expand Up @@ -304,10 +304,4 @@ spec:
storage: false
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
`

0 comments on commit 020ccff

Please sign in to comment.