Skip to content

Commit

Permalink
chore: update controller-gen to v0.9.2
Browse files Browse the repository at this point in the history 
This mostly pulls in many fixes from controller-tools. Mainly
controller-gen now respects type marker in types and generated the CRD
manifests accordingly. This means that SSA now functions correctly with
the generated manifests. Accordingly this also reenables the
`revert-test`.
The other changes added here are mostly whitespace changes in the
manifests, the status being no longer included in the CRD manifests (see
kubernetes-sigs/controller-tools#456 for
details) and we seem to have forgotten to regenerate some manifests
after a version bump.

Fixes: rhobs#142

Signed-off-by: Jan Fajerski <jfajersk@redhat.com>
  • Loading branch information
@jan--f
jan--f committed Jul 8, 2022
1 parent b9bd550 commit 320f18f
Show file tree
Hide file tree
Showing 15 changed files with 5,462 additions and 338 deletions.
2 changes: 1 addition & 1 deletion .github/tools
View file
@@ -1,7 +1,7 @@
# DO NOT EDIT! Autogenerated by make tools

golangci-lint v1.45.2
controller-gen v0.7.0
controller-gen v0.9.2
kustomize v3.9.4
oc v4.8.11
operator-sdk v1.13.0
Expand Down
2 changes: 1 addition & 1 deletion Makefile.tools
View file
Expand Up @@ -8,7 +8,7 @@ TOOLS_DIR = $(shell pwd)/tmp/bin
# see: .github/tools-cache/action.yaml

CONTROLLER_GEN=$(TOOLS_DIR)/controller-gen
CONTROLLER_GEN_VERSION= v0.7.0
CONTROLLER_GEN_VERSION= v0.9.2

KUSTOMIZE=$(TOOLS_DIR)/kustomize
KUSTOMIZE_VERSION= v3.9.4
Expand Down
32 changes: 21 additions & 11 deletions deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: monitoringstacks.monitoring.rhobs
spec:
Expand Down Expand Up @@ -90,6 +89,7 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
dataSourceRef:
description: 'Specifies the object from which to populate
the volume with data, if a non-empty volume is desired.
Expand All @@ -105,10 +105,10 @@ spec:
if one of them is empty and the other is non-empty. There
are two important differences between DataSource and DataSourceRef:
* While DataSource only allows two specific types of objects,
DataSourceRef allows any non-core object, as well as PersistentVolumeClaim
DataSourceRef allows any non-core object, as well as PersistentVolumeClaim
objects. * While DataSource ignores disallowed values (dropping
them), DataSourceRef preserves all values, and generates
an error if a disallowed value is specified. (Alpha) Using
them), DataSourceRef preserves all values, and generates
an error if a disallowed value is specified. (Alpha) Using
this field requires the AnyVolumeDataSource feature gate
to be enabled.'
properties:
Expand All @@ -128,6 +128,7 @@ spec:
- kind
- name
type: object
x-kubernetes-map-type: atomic
resources:
description: 'Resources represents the minimum resources the
volume should have. If RecoverVolumeExpansionFailure feature
Expand Down Expand Up @@ -205,6 +206,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
storageClassName:
description: 'Name of the StorageClass required by the claim.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
Expand Down Expand Up @@ -248,6 +250,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
credentialsFile:
description: File to read a secret from, mutually exclusive
with Credentials (from SafeAuthorization)
Expand Down Expand Up @@ -280,6 +283,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
username:
description: The secret in the service monitor namespace
that contains the username for authentication.
Expand All @@ -300,6 +304,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
bearerToken:
description: Bearer token for remote write.
Expand Down Expand Up @@ -363,6 +368,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
secret:
description: Secret containing data to use for the
targets.
Expand All @@ -384,6 +390,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
clientSecret:
description: The secret containing the OAuth2 client
Expand All @@ -405,6 +412,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
endpointParams:
additionalProperties:
type: string
Expand Down Expand Up @@ -503,6 +511,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
profile:
description: Profile is the named AWS profile used to
authenticate.
Expand Down Expand Up @@ -536,6 +545,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
tlsConfig:
description: TLS Config to use for remote write.
Expand Down Expand Up @@ -564,6 +574,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
secret:
description: Secret containing data to use for the
targets.
Expand All @@ -585,6 +596,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
caFile:
description: Path to the CA cert in the Prometheus container
Expand Down Expand Up @@ -614,6 +626,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
secret:
description: Secret containing data to use for the
targets.
Expand All @@ -635,6 +648,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
certFile:
description: Path to the client cert file in the Prometheus
Expand Down Expand Up @@ -667,6 +681,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
serverName:
description: Used to verify the hostname for the targets.
type: string
Expand Down Expand Up @@ -788,6 +803,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
resources:
default:
limits:
Expand Down Expand Up @@ -840,9 +856,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
10 changes: 2 additions & 8 deletions deploy/crds/common/monitoring.rhobs_thanosqueriers.yaml
View file
@@ -1,10 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.7.0
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: thanosqueriers.monitoring.rhobs
spec:
Expand Down Expand Up @@ -102,6 +101,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
required:
- selector
type: object
Expand All @@ -115,9 +115,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

0 comments on commit 320f18f

Please sign in to comment.