Skip to content

Commit

Permalink
chore: update controller-gen to v0.9.1
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 6, 2022
1 parent b7186d8 commit dc3c96b
Show file tree
Hide file tree
Showing 14 changed files with 6,174 additions and 336 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.1
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.1

KUSTOMIZE=$(TOOLS_DIR)/kustomize
KUSTOMIZE_VERSION= v3.9.4
Expand Down
58 changes: 47 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.1
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 All @@ -229,6 +231,9 @@ spec:
description: Authorization section for remote write
properties:
credentials:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: The secret's key that contains the credentials
of the request
properties:
Expand Down Expand Up @@ -261,6 +266,9 @@ spec:
description: BasicAuth for the URL.
properties:
password:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: The secret in the service monitor namespace
that contains the password for authentication.
properties:
Expand All @@ -281,6 +289,9 @@ spec:
- key
type: object
username:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: The secret in the service monitor namespace
that contains the username for authentication.
properties:
Expand Down Expand Up @@ -344,6 +355,9 @@ spec:
OAuth2 client id
properties:
configMap:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: ConfigMap containing data to use for
the targets.
properties:
Expand All @@ -364,6 +378,9 @@ spec:
- key
type: object
secret:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: Secret containing data to use for the
targets.
properties:
Expand All @@ -386,6 +403,9 @@ spec:
type: object
type: object
clientSecret:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: The secret containing the OAuth2 client
secret
properties:
Expand Down Expand Up @@ -484,6 +504,9 @@ spec:
Verification 4
properties:
accessKey:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: AccessKey is the AWS API key. If blank,
the environment variable `AWS_ACCESS_KEY_ID` is used.
properties:
Expand Down Expand Up @@ -516,6 +539,9 @@ spec:
authenticate.
type: string
secretKey:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: SecretKey is the AWS API secret. If blank,
the environment variable `AWS_SECRET_ACCESS_KEY` is
used.
Expand Down Expand Up @@ -545,6 +571,9 @@ spec:
the targets.
properties:
configMap:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: ConfigMap containing data to use for
the targets.
properties:
Expand All @@ -565,6 +594,9 @@ spec:
- key
type: object
secret:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: Secret containing data to use for the
targets.
properties:
Expand Down Expand Up @@ -595,6 +627,9 @@ spec:
for the targets.
properties:
configMap:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: ConfigMap containing data to use for
the targets.
properties:
Expand All @@ -615,6 +650,9 @@ spec:
- key
type: object
secret:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: Secret containing data to use for the
targets.
properties:
Expand Down Expand Up @@ -648,6 +686,9 @@ spec:
container for the targets.
type: string
keySecret:
allOf:
- x-kubernetes-map-type: atomic
- x-kubernetes-map-type: atomic
description: Secret containing the client key file for
the targets.
properties:
Expand Down Expand Up @@ -788,6 +829,7 @@ spec:
are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
resources:
default:
limits:
Expand Down Expand Up @@ -840,9 +882,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.1
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 dc3c96b

Please sign in to comment.