Skip to content

Commit

Permalink
chore: update controller tools from v0.11.0 to v0.14.0 (#14)
Browse files Browse the repository at this point in the history
This should fix the build error that currently happens:
panic: runtime error: invalid memory address or nil pointer dereference [recovered]
	panic: runtime error: invalid memory address or nil pointer dereference
[signal SIGSEGV: segmentation violation code=0x1 addr=0x0 pc=0xa[40]

Signed-off-by: Bastian Krol <[email protected]>
  • Loading branch information
basti1302 authored Oct 9, 2024
1 parent 4ccf03f commit eb9601a
Show file tree
Hide file tree
Showing 7 changed files with 158 additions and 702 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v3.8.7
CONTROLLER_TOOLS_VERSION ?= v0.11.1
CONTROLLER_TOOLS_VERSION ?= v0.14.0

KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
.PHONY: kustomize
Expand Down
1 change: 0 additions & 1 deletion api/v1alpha1/zz_generated.deepcopy.go

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

124 changes: 65 additions & 59 deletions config/crd/bases/perses.dev_perses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.11.1
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: perses.perses.dev
spec:
group: perses.dev
Expand All @@ -21,14 +20,19 @@ spec:
description: Perses is the Schema for the perses API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: |-
APIVersion defines the versioned schema of this representation of an object.
Servers should convert recognized schemas to the latest internal value, and
may reject unrecognized values.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand Down Expand Up @@ -248,9 +252,10 @@ spec:
datasources_path:
type: string
interval:
description: Duration wraps time.Duration. It is used to parse
the custom duration format from YAML. This type should not
propagate beyond the scope of input/output processing.
description: |-
Duration wraps time.Duration. It is used to parse the custom duration format
from YAML.
This type should not propagate beyond the scope of input/output processing.
format: int64
type: integer
panels_path:
Expand All @@ -275,9 +280,9 @@ spec:
format: int64
type: integer
disable_sign_up:
description: DisableSignUp deactivates the Sign-up page
in the UI. It also disables the endpoint that gives
the possibility to create a user.
description: |-
DisableSignUp deactivates the Sign-up page in the UI.
It also disables the endpoint that gives the possibility to create a user.
type: boolean
providers:
description: Providers configure the different authentication
Expand Down Expand Up @@ -450,10 +455,10 @@ spec:
- enable_native
type: object
refresh_token_ttl:
description: RefreshTokenTTL is the time to live of the
refresh token. The refresh token is used to get a new
access token when it is expired. By default, it is 24
hours.
description: |-
RefreshTokenTTL is the time to live of the refresh token.
The refresh token is used to get a new access token when it is expired.
By default, it is 24 hours.
format: int64
type: integer
required:
Expand Down Expand Up @@ -482,9 +487,9 @@ spec:
type: string
type: array
scopes:
description: 'The list of kind targeted by the permission.
For example: `Datasource`, `Dashboard`, ... With
Role, you can''t target global kinds'
description: |-
The list of kind targeted by the permission. For example: `Datasource`, `Dashboard`, ...
With Role, you can't target global kinds
items:
type: string
type: array
Expand All @@ -495,17 +500,17 @@ spec:
type: array
type: object
enable_auth:
description: When it is true, the authentication and authorization
config are considered. And you will need a valid JWT token
to contact most of the endpoints exposed by the API
description: |-
When it is true, the authentication and authorization config are considered.
And you will need a valid JWT token to contact most of the endpoints exposed by the API
type: boolean
encryption_key:
description: EncryptionKey is the secret key used to encrypt
and decrypt sensitive data stored in the database such as
the password of the basic auth for a datasource. Note that
if it is not provided, it will use a default value. On a
production instance, you should set this key. Also note
the key must be at least 32 bytes long.
description: |-
EncryptionKey is the secret key used to encrypt and decrypt sensitive data
stored in the database such as the password of the basic auth for a datasource.
Note that if it is not provided, it will use a default value.
On a production instance, you should set this key.
Also note the key must be at least 32 bytes long.
type: string
encryption_key_file:
description: EncryptionKeyFile is the path to file containing
Expand All @@ -532,42 +537,42 @@ spec:
conditions:
items:
description: "Condition contains details for one aspect of the current
state of this API Resource. --- This struct is intended for direct
use as an array at the field path .status.conditions. For example,
\n type FooStatus struct{ // Represents the observations of a
foo's current state. // Known .status.conditions.type are: \"Available\",
\"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
// +listType=map // +listMapKey=type Conditions []metav1.Condition
`json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
state of this API Resource.\n---\nThis struct is intended for
direct use as an array at the field path .status.conditions. For
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
observations of a foo's current state.\n\t // Known .status.conditions.type
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
\ // other fields\n\t}"
properties:
lastTransitionTime:
description: lastTransitionTime is the last time the condition
transitioned from one status to another. This should be when
the underlying condition changed. If that is not known, then
using the time when the API field changed is acceptable.
description: |-
lastTransitionTime is the last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
format: date-time
type: string
message:
description: message is a human readable message indicating
details about the transition. This may be an empty string.
description: |-
message is a human readable message indicating details about the transition.
This may be an empty string.
maxLength: 32768
type: string
observedGeneration:
description: observedGeneration represents the .metadata.generation
that the condition was set based upon. For instance, if .metadata.generation
is currently 12, but the .status.conditions[x].observedGeneration
is 9, the condition is out of date with respect to the current
state of the instance.
description: |-
observedGeneration represents the .metadata.generation that the condition was set based upon.
For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
with respect to the current state of the instance.
format: int64
minimum: 0
type: integer
reason:
description: reason contains a programmatic identifier indicating
the reason for the condition's last transition. Producers
of specific condition types may define expected values and
meanings for this field, and whether the values are considered
a guaranteed API. The value should be a CamelCase string.
description: |-
reason contains a programmatic identifier indicating the reason for the condition's last transition.
Producers of specific condition types may define expected values and meanings for this field,
and whether the values are considered a guaranteed API.
The value should be a CamelCase string.
This field may not be empty.
maxLength: 1024
minLength: 1
Expand All @@ -581,11 +586,12 @@ spec:
- Unknown
type: string
type:
description: type of condition in CamelCase or in foo.example.com/CamelCase.
--- Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
description: |-
type of condition in CamelCase or in foo.example.com/CamelCase.
---
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
useful (see .node.status.conditions), the ability to deconflict is important.
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
maxLength: 316
pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
type: string
Expand Down
Loading

0 comments on commit eb9601a

Please sign in to comment.