Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update controller-tools #900

Merged
merged 5 commits into from
Mar 27, 2024
Merged

chore: Update controller-tools #900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35b638d
chore: Update controller-tools
chrkl Mar 25, 2024
78b623a
Update table-gen
chrkl Mar 26, 2024
e77d464
Apply review suggestions
chrkl Mar 26, 2024
6a024c0
Update manifests for dev release
chrkl Mar 26, 2024
fda03d1
Merge branch 'main' into bump-controller-tools
chrkl Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ ENV_GARDENER_K8S_VERSION=1.27
ENV_GARDENER_OS_VERSION="Not Defined"

## Dependencies
ENV_CONTROLLER_TOOLS_VERSION=v0.11.3
ENV_CONTROLLER_TOOLS_VERSION=v0.14.0
ENV_GINKGO_VERSION=v2.17.1
ENV_GO_TEST_COVERAGE_VERSION=v2.8.2
ENV_GOLANGCI_LINT_VERSION=latest
ENV_ISTIO_VERSION=1.4.0
ENV_K3D_VERSION=v5.4.7
ENV_KUSTOMIZE_VERSION=v5.0.1
ENV_TABLE_GEN_VERSION=v0.0.0-20230523174756-3dae9f177ffd
ENV_TABLE_GEN_VERSION=v0.0.0-20240326093045-fb4e2cac1148
ENV_GORELEASER_VERSION=v1.23.0
ENV_GARDENER_MACHINE_TYPE=n1-standard-4
ENV_GARDENER_MIN_NODES=1
Expand Down
2 changes: 1 addition & 1 deletion apis/operator/v1alpha1/telemetry_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ type Scaling struct {
// +kubebuilder:validation:Enum=Static
Type ScalingStrategyType `json:"type,omitempty"`

// Static is a scaling strategy allowing you to define a custom amount of replicas to be used for the gateway. Present only if Type =
// Static is a scaling strategy enabling you to define a custom amount of replicas to be used for the gateway. Present only if Type =
// StaticScalingStrategyType.
// +optional
Static *StaticScaling `json:"static,omitempty"`
Expand Down
102 changes: 54 additions & 48 deletions config/crd/bases/operator.kyma-project.io_telemetries.yaml
View file
Open in desktop
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.3
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: telemetries.operator.kyma-project.io
spec:
group: operator.kyma-project.io
Expand All @@ -31,14 +30,19 @@ spec:
description: Telemetry is the Schema for the telemetries 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 All @@ -56,9 +60,9 @@ spec:
strategy type.
properties:
static:
description: Static is a scaling strategy allowing you
to define a custom amount of replicas to be used for
the gateway. Present only if Type = StaticScalingStrategyType.
description: |-
Static is a scaling strategy enabling you to define a custom amount of replicas to be used for the gateway. Present only if Type =
StaticScalingStrategyType.
properties:
replicas:
description: Replicas defines a static number of pods
Expand Down Expand Up @@ -87,9 +91,9 @@ spec:
strategy type.
properties:
static:
description: Static is a scaling strategy allowing you
to define a custom amount of replicas to be used for
the gateway. Present only if Type = StaticScalingStrategyType.
description: |-
Static is a scaling strategy enabling you to define a custom amount of replicas to be used for the gateway. Present only if Type =
StaticScalingStrategyType.
properties:
replicas:
description: Replicas defines a static number of pods
Expand All @@ -112,47 +116,47 @@ spec:
description: TelemetryStatus defines the observed state of Telemetry
properties:
conditions:
description: Conditions contain a set of conditionals to determine
the State of Status. If all Conditions are met, State is expected
to be in StateReady.
description: |-
Conditions contain a set of conditionals to determine the State of Status.
If all Conditions are met, State is expected to be in StateReady.
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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This description is imported from a dependency and not under our control.

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 @@ -166,11 +170,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 Expand Up @@ -210,8 +215,9 @@ spec:
type: object
type: object
state:
description: 'State signifies current state of Module CR. Value can
be one of these three: "Ready", "Deleting", or "Warning".'
description: |-
State signifies current state of Module CR.
Value can be one of these three: "Ready", "Deleting", or "Warning".
enum:
- Deleting
- Ready
Expand Down
Loading
Loading