Skip to content

Commit 741ae3b

Browse files
mpryckaovilai
mpryc
and
kaovilai
authored
OADP Non Admin velero manifest updates. (#255)
Signed-off-by: Michal Pryc <[email protected]> Signed-off-by: Tiger Kaovilai <[email protected]> Co-authored-by: Tiger Kaovilai <[email protected]>
1 parent a46d4d8 commit 741ae3b

File tree

54 files changed

+243
-388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+243
-388
lines changed

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.22 AS builder
2+
FROM --platform=$BUILDPLATFORM golang:1.23 AS builder
33
ARG BUILDPLATFORM
44
ARG TARGETOS
55
ARG TARGETARCH

‎Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ GOLANGCI_LINT = $(LOCALBIN)/golangci-lint-$(GOLANGCI_LINT_VERSION)
165165

166166
## Tool Versions
167167
KUSTOMIZE_VERSION ?= v5.3.0
168-
CONTROLLER_TOOLS_VERSION ?= v0.14.0
168+
CONTROLLER_TOOLS_VERSION ?= v0.16.5
169169
ENVTEST_VERSION ?= v0.0.0-20240320141353-395cfc7486e6
170170
GOLANGCI_LINT_VERSION ?= v1.62.2
171171

‎config/crd/bases/oadp.openshift.io_nonadminbackups.yaml

+4-19
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: nonadminbackups.oadp.openshift.io
88
spec:
99
group: oadp.openshift.io
@@ -66,7 +66,6 @@ spec:
6666
DefaultVolumesToRestic specifies whether restic should be used to take a
6767
backup of all pod volumes by default.
6868
69-
7069
Deprecated: this field is no longer used and will be removed entirely in future. Use DefaultVolumesToFsBackup instead.
7170
nullable: true
7271
type: boolean
@@ -534,16 +533,8 @@ spec:
534533
properties:
535534
conditions:
536535
items:
537-
description: "Condition contains details for one aspect of the current
538-
state of this API Resource.\n---\nThis struct is intended for
539-
direct use as an array at the field path .status.conditions. For
540-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
541-
observations of a foo's current state.\n\t // Known .status.conditions.type
542-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
543-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
544-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
545-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
546-
\ // other fields\n\t}"
536+
description: Condition contains details for one aspect of the current
537+
state of this API Resource.
547538
properties:
548539
lastTransitionTime:
549540
description: |-
@@ -584,12 +575,7 @@ spec:
584575
- Unknown
585576
type: string
586577
type:
587-
description: |-
588-
type of condition in CamelCase or in foo.example.com/CamelCase.
589-
---
590-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
591-
useful (see .node.status.conditions), the ability to deconflict is important.
592-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
578+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
593579
maxLength: 316
594580
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])$
595581
type: string
@@ -730,7 +716,6 @@ spec:
730716
DefaultVolumesToRestic specifies whether restic should be used to take a
731717
backup of all pod volumes by default.
732718
733-
734719
Deprecated: this field is no longer used and will be removed entirely in future. Use DefaultVolumesToFsBackup instead.
735720
nullable: true
736721
type: boolean

‎config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocationrequests.yaml

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: nonadminbackupstoragelocationrequests.oadp.openshift.io
88
spec:
99
group: oadp.openshift.io
@@ -111,9 +111,7 @@ spec:
111111
This field is effectively required, but due to backwards compatibility is
112112
allowed to be empty. Instances of this type with an empty value here are
113113
almost certainly wrong.
114-
TODO: Add other useful fields. apiVersion, kind, uid?
115114
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
116-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
117115
type: string
118116
optional:
119117
description: Specify whether the Secret or its key must

‎config/crd/bases/oadp.openshift.io_nonadminbackupstoragelocations.yaml

+4-21
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: nonadminbackupstoragelocations.oadp.openshift.io
88
spec:
99
group: oadp.openshift.io
@@ -79,9 +79,7 @@ spec:
7979
This field is effectively required, but due to backwards compatibility is
8080
allowed to be empty. Instances of this type with an empty value here are
8181
almost certainly wrong.
82-
TODO: Add other useful fields. apiVersion, kind, uid?
8382
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
84-
TODO: Drop `kubebuilder:default` when controller-gen doesn't need it https://github.com/kubernetes-sigs/kubebuilder/issues/3896.
8583
type: string
8684
optional:
8785
description: Specify whether the Secret or its key must be
@@ -135,16 +133,8 @@ spec:
135133
properties:
136134
conditions:
137135
items:
138-
description: "Condition contains details for one aspect of the current
139-
state of this API Resource.\n---\nThis struct is intended for
140-
direct use as an array at the field path .status.conditions. For
141-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
142-
observations of a foo's current state.\n\t // Known .status.conditions.type
143-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
144-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
145-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
146-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
147-
\ // other fields\n\t}"
136+
description: Condition contains details for one aspect of the current
137+
state of this API Resource.
148138
properties:
149139
lastTransitionTime:
150140
description: |-
@@ -185,12 +175,7 @@ spec:
185175
- Unknown
186176
type: string
187177
type:
188-
description: |-
189-
type of condition in CamelCase or in foo.example.com/CamelCase.
190-
---
191-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
192-
useful (see .node.status.conditions), the ability to deconflict is important.
193-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
178+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
194179
maxLength: 316
195180
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])$
196181
type: string
@@ -235,7 +220,6 @@ spec:
235220
description: |-
236221
AccessMode is an unused field.
237222
238-
239223
Deprecated: there is now an AccessMode field on the Spec and this field
240224
will be removed entirely as of v2.0.
241225
enum:
@@ -247,7 +231,6 @@ spec:
247231
LastSyncedRevision is the value of the `metadata/revision` file in the backup
248232
storage location the last time the BSL's contents were synced into the cluster.
249233
250-
251234
Deprecated: this field is no longer updated or used for detecting changes to
252235
the location's contents and will be removed entirely in v2.0.
253236
type: string

‎config/crd/bases/oadp.openshift.io_nonadmindownloadrequests.yaml

+4-17
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: nonadmindownloadrequests.oadp.openshift.io
88
spec:
99
group: oadp.openshift.io
@@ -86,16 +86,8 @@ spec:
8686
properties:
8787
conditions:
8888
items:
89-
description: "Condition contains details for one aspect of the current
90-
state of this API Resource.\n---\nThis struct is intended for
91-
direct use as an array at the field path .status.conditions. For
92-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
93-
observations of a foo's current state.\n\t // Known .status.conditions.type
94-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
95-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
96-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
97-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
98-
\ // other fields\n\t}"
89+
description: Condition contains details for one aspect of the current
90+
state of this API Resource.
9991
properties:
10092
lastTransitionTime:
10193
description: |-
@@ -136,12 +128,7 @@ spec:
136128
- Unknown
137129
type: string
138130
type:
139-
description: |-
140-
type of condition in CamelCase or in foo.example.com/CamelCase.
141-
---
142-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
143-
useful (see .node.status.conditions), the ability to deconflict is important.
144-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
131+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
145132
maxLength: 316
146133
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])$
147134
type: string

‎config/crd/bases/oadp.openshift.io_nonadminrestores.yaml

+4-17
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.14.0
6+
controller-gen.kubebuilder.io/version: v0.16.5
77
name: nonadminrestores.oadp.openshift.io
88
spec:
99
group: oadp.openshift.io
@@ -467,16 +467,8 @@ spec:
467467
properties:
468468
conditions:
469469
items:
470-
description: "Condition contains details for one aspect of the current
471-
state of this API Resource.\n---\nThis struct is intended for
472-
direct use as an array at the field path .status.conditions. For
473-
example,\n\n\n\ttype FooStatus struct{\n\t // Represents the
474-
observations of a foo's current state.\n\t // Known .status.conditions.type
475-
are: \"Available\", \"Progressing\", and \"Degraded\"\n\t //
476-
+patchMergeKey=type\n\t // +patchStrategy=merge\n\t // +listType=map\n\t
477-
\ // +listMapKey=type\n\t Conditions []metav1.Condition `json:\"conditions,omitempty\"
478-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
479-
\ // other fields\n\t}"
470+
description: Condition contains details for one aspect of the current
471+
state of this API Resource.
480472
properties:
481473
lastTransitionTime:
482474
description: |-
@@ -517,12 +509,7 @@ spec:
517509
- Unknown
518510
type: string
519511
type:
520-
description: |-
521-
type of condition in CamelCase or in foo.example.com/CamelCase.
522-
---
523-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
524-
useful (see .node.status.conditions), the ability to deconflict is important.
525-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
512+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
526513
maxLength: 316
527514
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])$
528515
type: string

0 commit comments

Comments
 (0)