Skip to content

Commit

Permalink
chore(deps): bump dependencies and resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@floreks
floreks committed Sep 13, 2024
1 parent 0b69880 commit 3eece4d
Show file tree
Hide file tree
Showing 9 changed files with 1,077 additions and 636 deletions.
21 changes: 4 additions & 17 deletions config/crd/bases/deployments.plural.sh_customhealths.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: customhealths.deployments.plural.sh
spec:
group: deployments.plural.sh
Expand Down Expand Up @@ -49,16 +49,8 @@ spec:
description: Represents the observations of a HealthConvert current
state.
items:
description: "Condition contains details for one aspect of the current
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}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -99,12 +91,7 @@ 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.
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
822 changes: 652 additions & 170 deletions config/crd/bases/deployments.plural.sh_pipelinegates.yaml
View file

Large diffs are not rendered by default.

31 changes: 9 additions & 22 deletions config/crd/bases/deployments.plural.sh_upgradeinsights.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: upgradeinsights.deployments.plural.sh
spec:
group: deployments.plural.sh
Expand Down Expand Up @@ -69,14 +69,14 @@ spec:
secretAccessKeyRef:
description: "SecretAccessKeyRef is a reference to the secret
that contains secret access key.\nSince UpgradeInsights
is a cluster-scoped resource we can't use local reference.\n\n\nSecretAccessKey
must be stored in a key named \"secretAccessKey\".\n\n\nAn
is a cluster-scoped resource we can't use local reference.\n\nSecretAccessKey
must be stored in a key named \"secretAccessKey\".\n\nAn
example secret can look like this:\n\tapiVersion: v1\n\tkind:
Secret\n\tmetadata:\n name: eks-credentials\n namespace:
upgrade-insights-test\n\tstringData:\n secretAccessKey:
\"changeme\"\n\n\nThen it can be referenced like this:\n
\ ...\n secretAccessKeyRef:\n name: eks-credentials\n
\ namespace: upgrade-insights-test"
\"changeme\"\n\nThen it can be referenced like this:\n ...\n
\ secretAccessKeyRef:\n name: eks-credentials\n namespace:
upgrade-insights-test"
properties:
name:
description: name is unique within a namespace to reference
Expand Down Expand Up @@ -113,16 +113,8 @@ spec:
description: Represents the observations of a PrAutomation's current
state.
items:
description: "Condition contains details for one aspect of the current
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}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -163,12 +155,7 @@ 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.
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
51 changes: 28 additions & 23 deletions config/crd/bases/deployments.plural.sh_virtualclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.14.0
controller-gen.kubebuilder.io/version: v0.16.3
name: virtualclusters.deployments.plural.sh
spec:
group: deployments.plural.sh
Expand Down Expand Up @@ -115,10 +115,13 @@ spec:
valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
optional:
description: Specify whether the Secret or its key must be defined
Expand Down Expand Up @@ -164,10 +167,13 @@ spec:
description: The key to select.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
optional:
description: Specify whether the ConfigMap or its key
Expand All @@ -187,10 +193,13 @@ spec:
be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
optional:
description: Specify whether the Secret or its key must
Expand Down Expand Up @@ -226,10 +235,13 @@ spec:
description: The key to select.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
optional:
description: Specify whether the ConfigMap or its key
Expand All @@ -249,10 +261,13 @@ spec:
be a valid secret key.
type: string
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
optional:
description: Specify whether the Secret or its key must
Expand All @@ -271,10 +286,13 @@ spec:
on how to access created virtual cluster.
properties:
name:
default: ""
description: |-
Name of the referent.
This field is effectively required, but due to backwards compatibility is
allowed to be empty. Instances of this type with an empty value here are
almost certainly wrong.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion, kind, uid?
type: string
type: object
x-kubernetes-map-type: atomic
Expand All @@ -289,16 +307,8 @@ spec:
description: Represents the observations of a PrAutomation's current
state.
items:
description: "Condition contains details for one aspect of the current
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}"
description: Condition contains details for one aspect of the current
state of this API Resource.
properties:
lastTransitionTime:
description: |-
Expand Down Expand Up @@ -339,12 +349,7 @@ 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.
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
27 changes: 2 additions & 25 deletions config/rbac/role.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,31 +21,6 @@ rules:
- deployments.plural.sh
resources:
- customhealths
verbs:
- create
- delete
- get
- list
- patch
- update
- watch
- apiGroups:
- deployments.plural.sh
resources:
- customhealths/finalizers
verbs:
- update
- apiGroups:
- deployments.plural.sh
resources:
- customhealths/status
verbs:
- get
- patch
- update
- apiGroups:
- deployments.plural.sh
resources:
- pipelinegates
verbs:
- create
Expand All @@ -58,12 +33,14 @@ rules:
- apiGroups:
- deployments.plural.sh
resources:
- customhealths/finalizers
- pipelinegates/finalizers
verbs:
- update
- apiGroups:
- deployments.plural.sh
resources:
- customhealths/status
- pipelinegates/status
verbs:
- get
Expand Down
Loading

0 comments on commit 3eece4d

Please sign in to comment.