Skip to content

Commit

Permalink
DO NOT MERGE: Bump to latest runtime and kubernetes deps
Browse files Browse the repository at this point in the history 
This bumps crossplane-runtime, controller-runtime, and k8s.io
dependencies to latest.

Depends on crossplane/crossplane-runtime#689

Signed-off-by: Nic Cope <[email protected]>
  • Loading branch information
@negz
negz committed May 7, 2024
1 parent 964c943 commit be9b5f6
Show file tree
Hide file tree
Showing 23 changed files with 832 additions and 267 deletions.
5 changes: 5 additions & 0 deletions .golangci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ linters:
# to communicate what the bool means.
- nonamedreturns

# TODO(negz): We do want these as of Go v1.22.
- copyloopvar
- intrange

linters-settings:
errcheck:
# report about not checking of errors in type assetions: `a := b.(MyStruct)`;
Expand Down Expand Up @@ -224,6 +228,7 @@ issues:
# Excluding generated files.
exclude-files:
- "zz_generated\\..+\\.go$"
- ".+\\.pb.go$"
# Excluding configuration per-path and per-linter.
exclude-rules:
# Exclude some linters from running on tests files.
Expand Down
12 changes: 12 additions & 0 deletions cluster/crds/apiextensions.crossplane.io_compositeresourcedefinitions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
kind:
description: |-
kind is the serialized kind of the resource. It is normally CamelCase and singular.
Expand All @@ -103,6 +104,7 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
singular:
description: singular is the singular name of the resource. It
must be all lowercase. Defaults to lowercased `kind`.
Expand Down Expand Up @@ -222,6 +224,7 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- conversionReviewVersions
type: object
Expand Down Expand Up @@ -312,6 +315,7 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
kind:
description: |-
kind is the serialized kind of the resource. It is normally CamelCase and singular.
Expand All @@ -336,6 +340,7 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
singular:
description: singular is the singular name of the resource. It
must be all lowercase. Defaults to lowercased `kind`.
Expand Down Expand Up @@ -483,6 +488,13 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
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.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand Down
26 changes: 20 additions & 6 deletions cluster/crds/apiextensions.crossplane.io_compositionrevisions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ spec:
type: string
mergeOptions:
description: MergeOptions Specifies merge options on
a field path
a field path.
properties:
appendSlice:
description: Specifies that already existing elements
Expand Down Expand Up @@ -701,7 +701,7 @@ spec:
type: string
mergeOptions:
description: MergeOptions Specifies merge options
on a field path
on a field path.
properties:
appendSlice:
description: Specifies that already existing elements
Expand Down Expand Up @@ -1239,7 +1239,7 @@ spec:
type: string
mergeOptions:
description: MergeOptions Specifies merge options
on a field path
on a field path.
properties:
appendSlice:
description: Specifies that already existing elements
Expand Down Expand Up @@ -1614,6 +1614,13 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
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.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand Down Expand Up @@ -1913,7 +1920,7 @@ spec:
type: string
mergeOptions:
description: MergeOptions Specifies merge options on
a field path
a field path.
properties:
appendSlice:
description: Specifies that already existing elements
Expand Down Expand Up @@ -2327,7 +2334,7 @@ spec:
type: string
mergeOptions:
description: MergeOptions Specifies merge options
on a field path
on a field path.
properties:
appendSlice:
description: Specifies that already existing elements
Expand Down Expand Up @@ -2865,7 +2872,7 @@ spec:
type: string
mergeOptions:
description: MergeOptions Specifies merge options
on a field path
on a field path.
properties:
appendSlice:
description: Specifies that already existing elements
Expand Down Expand Up @@ -3240,6 +3247,13 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
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.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand Down
6 changes: 3 additions & 3 deletions cluster/crds/apiextensions.crossplane.io_compositions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ spec:
type: string
mergeOptions:
description: MergeOptions Specifies merge options on
a field path
a field path.
properties:
appendSlice:
description: Specifies that already existing elements
Expand Down Expand Up @@ -696,7 +696,7 @@ spec:
type: string
mergeOptions:
description: MergeOptions Specifies merge options
on a field path
on a field path.
properties:
appendSlice:
description: Specifies that already existing elements
Expand Down Expand Up @@ -1237,7 +1237,7 @@ spec:
type: string
mergeOptions:
description: MergeOptions Specifies merge options
on a field path
on a field path.
properties:
appendSlice:
description: Specifies that already existing elements
Expand Down
7 changes: 7 additions & 0 deletions cluster/crds/apiextensions.crossplane.io_usages.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,13 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
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.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand Down
12 changes: 12 additions & 0 deletions cluster/crds/pkg.crossplane.io_configurationrevisions.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,13 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
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.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand Down Expand Up @@ -235,6 +242,7 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
nonResourceURLs:
description: |-
NonResourceURLs is a set of partial urls that a user should have access to. *s are allowed, but only as the full, final step in the path
Expand All @@ -243,25 +251,29 @@ spec:
items:
type: string
type: array
x-kubernetes-list-type: atomic
resourceNames:
description: ResourceNames is an optional white list of names
that the rule applies to. An empty set means that everything
is allowed.
items:
type: string
type: array
x-kubernetes-list-type: atomic
resources:
description: Resources is a list of resources this rule applies
to. '*' represents all resources.
items:
type: string
type: array
x-kubernetes-list-type: atomic
verbs:
description: Verbs is a list of Verbs that apply to ALL the
ResourceKinds contained in this rule. '*' represents all verbs.
items:
type: string
type: array
x-kubernetes-list-type: atomic
required:
- verbs
type: object
Expand Down
7 changes: 7 additions & 0 deletions cluster/crds/pkg.crossplane.io_configurations.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,13 @@ spec:
A Message containing details about this condition's last transition from
one status to another, if any.
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.
format: int64
type: integer
reason:
description: A Reason for this condition's last transition from
one status to another.
Expand Down
Loading

0 comments on commit be9b5f6

Please sign in to comment.