Skip to content

Commit

Permalink
Upgrade Kubernetes libraries to 0.26.4 (kubernetes-sigs#506)
Browse files Browse the repository at this point in the history 
OCP 4.13 is based on Kubernetes 1.26.
Use generic sets.
Bump other dependencies.
  • Loading branch information
@qbarrand
qbarrand authored Apr 26, 2023
1 parent 5fbc964 commit 720a04e
Show file tree
Hide file tree
Showing 1,124 changed files with 76,610 additions and 40,453 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ golangci-lint: ## Download golangci-lint locally if necessary.

.PHONY: mockgen
mockgen: ## Install mockgen locally.
go install github.com/golang/mock/mockgen@v1.6.0
go install github.com/golang/mock/mockgen@v1.7.0-rc.1

KUSTOMIZE = $(shell pwd)/bin/kustomize
.PHONY: kustomize
Expand Down
114 changes: 96 additions & 18 deletions bundle-hub/manifests/hub.kmm.sigs.x-k8s.io_managedclustermodules.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,30 @@ spec:
description: 'Compute Resources required by this container.
Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
properties:
claims:
description: "Claims lists the names of resources,
defined in spec.resourceClaims, that are used by
this container. \n This is an alpha field and requires
enabling the DynamicResourceAllocation feature gate.
\n This field is immutable. It can only be set for
containers."
items:
description: ResourceClaim references one entry
in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the name of one
entry in pod.spec.resourceClaims of the Pod
where this field is used. It makes that resource
available inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -783,10 +807,13 @@ spec:
can support the specified data source,
it will create a new volume based on the
contents of the specified data source.
If the AnyVolumeDataSource feature gate
is enabled, this field will always have
the same contents as the DataSourceRef
field.'
When the AnyVolumeDataSource feature gate
is enabled, dataSource contents will be
copied to dataSourceRef, and dataSourceRef
contents will be copied to dataSource
when dataSourceRef.namespace is not specified.
If the namespace is specified, then dataSourceRef
will not be copied to dataSource.'
properties:
apiGroup:
description: APIGroup is the group for
Expand All @@ -813,31 +840,39 @@ spec:
description: 'dataSourceRef specifies the
object from which to populate the volume
with data, if a non-empty volume is desired.
This may be any local object from a non-empty
This may be any object from a non-empty
API group (non core object) or a PersistentVolumeClaim
object. When this field is specified,
volume binding will only succeed if the
type of the specified object matches some
installed volume populator or dynamic
provisioner. This field will replace the
functionality of the DataSource field
functionality of the dataSource field
and as such if both fields are non-empty,
they must have the same value. For backwards
compatibility, both fields (DataSource
and DataSourceRef) will be set to the
compatibility, when namespace isn''t specified
in dataSourceRef, both fields (dataSource
and dataSourceRef) will be set to the
same value automatically if one of them
is empty and the other is non-empty. There
are two important differences between
DataSource and DataSourceRef: * While
DataSource only allows two specific types
of objects, DataSourceRef allows any non-core
object, as well as PersistentVolumeClaim
objects. * While DataSource ignores disallowed
values (dropping them), DataSourceRef
is empty and the other is non-empty. When
namespace is specified in dataSourceRef,
dataSource isn''t set to the same value
and must be empty. There are three important
differences between dataSource and dataSourceRef:
* While dataSource only allows two specific
types of objects, dataSourceRef allows
any non-core object, as well as PersistentVolumeClaim
objects. * While dataSource ignores disallowed
values (dropping them), dataSourceRef
preserves all values, and generates an
error if a disallowed value is specified.
* While dataSource only allows local objects,
dataSourceRef allows objects in any namespaces.
(Beta) Using this field requires the AnyVolumeDataSource
feature gate to be enabled.'
feature gate to be enabled. (Alpha) Using
the namespace field of dataSourceRef requires
the CrossNamespaceVolumeDataSource feature
gate to be enabled.'
properties:
apiGroup:
description: APIGroup is the group for
Expand All @@ -855,11 +890,23 @@ spec:
description: Name is the name of resource
being referenced
type: string
namespace:
description: Namespace is the namespace
of resource being referenced Note
that when a namespace is specified,
a gateway.networking.k8s.io/ReferenceGrant
object is required in the referent
namespace to allow that namespace's
owner to accept the reference. See
the ReferenceGrant documentation for
details. (Alpha) This field requires
the CrossNamespaceVolumeDataSource
feature gate to be enabled.
type: string
required:
- kind
- name
type: object
x-kubernetes-map-type: atomic
resources:
description: 'resources represents the minimum
resources the volume should have. If RecoverVolumeExpansionFailure
Expand All @@ -870,6 +917,32 @@ spec:
status field of the claim. More info:
https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
properties:
claims:
description: "Claims lists the names
of resources, defined in spec.resourceClaims,
that are used by this container. \n
This is an alpha field and requires
enabling the DynamicResourceAllocation
feature gate. \n This field is immutable.
It can only be set for containers."
items:
description: ResourceClaim references
one entry in PodSpec.ResourceClaims.
properties:
name:
description: Name must match the
name of one entry in pod.spec.resourceClaims
of the Pod where this field
is used. It makes that resource
available inside a container.
type: string
required:
- name
type: object
type: array
x-kubernetes-list-map-keys:
- name
x-kubernetes-list-type: map
limits:
additionalProperties:
anyOf:
Expand Down Expand Up @@ -2370,6 +2443,11 @@ spec:
- certSecret
- keySecret
type: object
version:
description: Version defines the current version of the
kernel module being used Used for upgrading the currently
loaded kernel module to a new version
type: string
required:
- kernelMappings
- modprobe
Expand Down
17 changes: 17 additions & 0 deletions ...-operator-controller-manager-metrics-monitor_monitoring.coreos.com_v1_servicemonitor.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
labels:
control-plane: controller-manager
name: kmm-operator-controller-manager-metrics-monitor
spec:
endpoints:
- bearerTokenFile: /var/run/secrets/kubernetes.io/serviceaccount/token
path: /metrics
port: https
scheme: https
tlsConfig:
insecureSkipVerify: true
selector:
matchLabels:
control-plane: controller-manager
16 changes: 16 additions & 0 deletions bundle/manifests/kmm-operator-prometheus-k8s_rbac.authorization.k8s.io_v1_role.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
creationTimestamp: null
name: kmm-operator-prometheus-k8s
rules:
- apiGroups:
- ""
resources:
- services
- endpoints
- pods
verbs:
- get
- list
- watch
13 changes: 13 additions & 0 deletions bundle/manifests/kmm-operator-prometheus-k8s_rbac.authorization.k8s.io_v1_rolebinding.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
creationTimestamp: null
name: kmm-operator-prometheus-k8s
roleRef:
apiGroup: rbac.authorization.k8s.io
kind: Role
name: kmm-operator-prometheus-k8s
subjects:
- kind: ServiceAccount
name: prometheus-k8s
namespace: openshift-monitoring
Loading

0 comments on commit 720a04e

Please sign in to comment.