Skip to content

Commit 7fd9887

Browse files
perdasilvaPer Goncalves da Silva
authored andcommitted
Bump kubernetes libraries to v0.31.0 and controller-runtime to v0.19.0 (#357)
* Bump kubernetes libraries to v0.31.0 and controller-runtime to v0.19.0 Signed-off-by: Per Goncalves da Silva <[email protected]> * Update manifests Signed-off-by: Per Goncalves da Silva <[email protected]> --------- Signed-off-by: Per Goncalves da Silva <[email protected]> Co-authored-by: Per Goncalves da Silva <[email protected]> Upstream-repository: api Upstream-commit: 41cb4aea2c2d86ad903a414593a2079de7250c70
1 parent f90d98d commit 7fd9887

37 files changed

+648
-1104
lines changed

manifests/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_00-installplans.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_00-olmconfigs.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_00-operatorconditions.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_00-operatorgroups.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_00-operators.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

manifests/0000_50_olm_00-subscriptions.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

microshift-manifests/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

microshift-manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

microshift-manifests/0000_50_olm_00-installplans.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

microshift-manifests/0000_50_olm_00-olmconfigs.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

microshift-manifests/0000_50_olm_00-operatorconditions.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

microshift-manifests/0000_50_olm_00-operatorgroups.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

microshift-manifests/0000_50_olm_00-operators.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

microshift-manifests/0000_50_olm_00-subscriptions.crd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.1
5+
controller-gen.kubebuilder.io/version: v0.16.2
66
include.release.openshift.io/ibm-cloud-managed: "true"
77
include.release.openshift.io/self-managed-high-availability: "true"
88
capability.openshift.io/name: "OperatorLifecycleManager"

staging/api/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ YQ ?= $(LOCALBIN)/yq
104104
KIND ?= $(LOCALBIN)/kind
105105

106106
## Tool Versions
107-
CONTROLLER_TOOLS_VERSION ?= v0.15.0
107+
CONTROLLER_TOOLS_VERSION ?= v0.16.1
108108
YQ_VERSION ?= v4.28.1
109109

110110
# Not guaranteed to have patch releases available and node image tags are full versions (i.e v1.28.0 - no v1.28, v1.29, etc.)

staging/api/crds/operators.coreos.com_catalogsources.yaml

Lines changed: 11 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.15.0
5+
controller-gen.kubebuilder.io/version: v0.16.1
66
name: catalogsources.operators.coreos.com
77
spec:
88
group: operators.coreos.com
@@ -363,7 +363,7 @@ spec:
363363
pod labels will be ignored. The default value is empty.
364364
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
365365
Also, matchLabelKeys cannot be set when labelSelector isn't set.
366-
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
366+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
367367
type: array
368368
items:
369369
type: string
@@ -378,7 +378,7 @@ spec:
378378
pod labels will be ignored. The default value is empty.
379379
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
380380
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
381-
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
381+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
382382
type: array
383383
items:
384384
type: string
@@ -535,7 +535,7 @@ spec:
535535
pod labels will be ignored. The default value is empty.
536536
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
537537
Also, matchLabelKeys cannot be set when labelSelector isn't set.
538-
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
538+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
539539
type: array
540540
items:
541541
type: string
@@ -550,7 +550,7 @@ spec:
550550
pod labels will be ignored. The default value is empty.
551551
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
552552
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
553-
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
553+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
554554
type: array
555555
items:
556556
type: string
@@ -708,7 +708,7 @@ spec:
708708
pod labels will be ignored. The default value is empty.
709709
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
710710
Also, matchLabelKeys cannot be set when labelSelector isn't set.
711-
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
711+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
712712
type: array
713713
items:
714714
type: string
@@ -723,7 +723,7 @@ spec:
723723
pod labels will be ignored. The default value is empty.
724724
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
725725
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
726-
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
726+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
727727
type: array
728728
items:
729729
type: string
@@ -880,7 +880,7 @@ spec:
880880
pod labels will be ignored. The default value is empty.
881881
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
882882
Also, matchLabelKeys cannot be set when labelSelector isn't set.
883-
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
883+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
884884
type: array
885885
items:
886886
type: string
@@ -895,7 +895,7 @@ spec:
895895
pod labels will be ignored. The default value is empty.
896896
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
897897
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
898-
This is an alpha field and requires enabling MatchLabelKeysInPodAffinity feature gate.
898+
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
899899
type: array
900900
items:
901901
type: string
@@ -992,13 +992,11 @@ spec:
992992
- the $GOMEMLIMIT environment variable will be set to this value in bytes
993993
- the memory request will be set to this value
994994
995-
996995
This field should be set if it's desired to reduce the footprint of a catalog server as much as possible, or if
997996
a catalog being served is very large and needs more than the default allocation. If your index image has a file-
998997
system cache, determine a good approximation for this value by doubling the size of the package cache at
999998
/tmp/cache/cache/packages.json in the index image.
1000999
1001-
10021000
This field is best-effort; if unset, no default will be used and no Pod memory limit or $GOMEMLIMIT value will be set.
10031001
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
10041002
anyOf:
@@ -1029,7 +1027,6 @@ spec:
10291027
specified. Specifying a value other than `legacy` or `restricted` result in a validation error. When using older
10301028
catalog images, which can not run in `restricted` mode, the SecurityContextConfig should be set to `legacy`.
10311029
1032-
10331030
More information about PSA can be found here: https://kubernetes.io/docs/concepts/security/pod-security-admission/'
10341031
type: string
10351032
enum:
@@ -1139,24 +1136,7 @@ spec:
11391136
introduced will use conditions.
11401137
type: array
11411138
items:
1142-
description: |-
1143-
Condition contains details for one aspect of the current state of this API Resource.
1144-
---
1145-
This struct is intended for direct use as an array at the field path .status.conditions. For example,
1146-
1147-
1148-
type FooStatus struct{
1149-
// Represents the observations of a foo's current state.
1150-
// Known .status.conditions.type are: "Available", "Progressing", and "Degraded"
1151-
// +patchMergeKey=type
1152-
// +patchStrategy=merge
1153-
// +listType=map
1154-
// +listMapKey=type
1155-
Conditions []metav1.Condition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"`
1156-
1157-
1158-
// other fields
1159-
}
1139+
description: Condition contains details for one aspect of the current state of this API Resource.
11601140
type: object
11611141
required:
11621142
- lastTransitionTime
@@ -1204,12 +1184,7 @@ spec:
12041184
- "False"
12051185
- Unknown
12061186
type:
1207-
description: |-
1208-
type of condition in CamelCase or in foo.example.com/CamelCase.
1209-
---
1210-
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be
1211-
useful (see .node.status.conditions), the ability to deconflict is important.
1212-
The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
1187+
description: type of condition in CamelCase or in foo.example.com/CamelCase.
12131188
type: string
12141189
maxLength: 316
12151190
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])$

0 commit comments

Comments
 (0)