Skip to content

Commit f2f7715

Browse files
stuggistuggi
authored
Merge pull request openstack-k8s-operators#299 from stuggi/fix_pre_commit
fix pre-commit
2 parents a435e5c + fee05e5 commit f2f7715

File tree

4 files changed

+80
-306
lines changed

4 files changed

+80
-306
lines changed

‎api/bases/neutron.openstack.org_neutronapis.yaml‎

Lines changed: 29 additions & 143 deletions
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.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.1
77
creationTimestamp: null
88
name: neutronapis.neutron.openstack.org
99
spec:
@@ -789,6 +789,34 @@ spec:
789789
recorded in the status field of the
790790
claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#resources'
791791
properties:
792+
claims:
793+
description: "Claims lists the names
794+
of resources, defined in spec.resourceClaims,
795+
that are used by this container.
796+
\n This is an alpha field and
797+
requires enabling the DynamicResourceAllocation
798+
feature gate. \n This field is
799+
immutable. It can only be set
800+
for containers."
801+
items:
802+
description: ResourceClaim references
803+
one entry in PodSpec.ResourceClaims.
804+
properties:
805+
name:
806+
description: Name must match
807+
the name of one entry in
808+
pod.spec.resourceClaims
809+
of the Pod where this field
810+
is used. It makes that resource
811+
available inside a container.
812+
type: string
813+
required:
814+
- name
815+
type: object
816+
type: array
817+
x-kubernetes-list-map-keys:
818+
- name
819+
x-kubernetes-list-type: map
792820
limits:
793821
additionalProperties:
794822
anyOf:
@@ -884,34 +912,6 @@ spec:
884912
name of the StorageClass required
885913
by the claim. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#class-1'
886914
type: string
887-
volumeAttributesClassName:
888-
description: 'volumeAttributesClassName
889-
may be used to set the VolumeAttributesClass
890-
used by this claim. If specified,
891-
the CSI driver will create or update
892-
the volume with the attributes defined
893-
in the corresponding VolumeAttributesClass.
894-
This has a different purpose than
895-
storageClassName, it can be changed
896-
after the claim is created. An empty
897-
string value means that no VolumeAttributesClass
898-
will be applied to the claim but it''s
899-
not allowed to reset this field to
900-
empty string once it is set. If unspecified
901-
and the PersistentVolumeClaim is unbound,
902-
the default VolumeAttributesClass
903-
will be set by the persistentvolume
904-
controller if it exists. If the resource
905-
referred to by volumeAttributesClass
906-
does not exist, this PersistentVolumeClaim
907-
will be set to a Pending state, as
908-
reflected by the modifyVolumeStatus
909-
field, until such as a resource exists.
910-
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#volumeattributesclass
911-
(Alpha) Using this field requires
912-
the VolumeAttributesClass feature
913-
gate to be enabled.'
914-
type: string
915915
volumeMode:
916916
description: volumeMode defines what
917917
type of volume is required by the
@@ -1327,120 +1327,6 @@ spec:
13271327
description: Projection that may be projected
13281328
along with other supported volume types
13291329
properties:
1330-
clusterTrustBundle:
1331-
description: "ClusterTrustBundle allows
1332-
a pod to access the `.spec.trustBundle`
1333-
field of ClusterTrustBundle objects
1334-
in an auto-updating file. \n Alpha,
1335-
gated by the ClusterTrustBundleProjection
1336-
feature gate. \n ClusterTrustBundle
1337-
objects can either be selected by name,
1338-
or by the combination of signer name
1339-
and a label selector. \n Kubelet performs
1340-
aggressive normalization of the PEM
1341-
contents written into the pod filesystem.
1342-
\ Esoteric PEM features such as inter-block
1343-
comments and block headers are stripped.
1344-
\ Certificates are deduplicated. The
1345-
ordering of certificates within the
1346-
file is arbitrary, and Kubelet may change
1347-
the order over time."
1348-
properties:
1349-
labelSelector:
1350-
description: Select all ClusterTrustBundles
1351-
that match this label selector. Only
1352-
has effect if signerName is set. Mutually-exclusive
1353-
with name. If unset, interpreted
1354-
as "match nothing". If set but
1355-
empty, interpreted as "match everything".
1356-
properties:
1357-
matchExpressions:
1358-
description: matchExpressions
1359-
is a list of label selector
1360-
requirements. The requirements
1361-
are ANDed.
1362-
items:
1363-
description: A label selector
1364-
requirement is a selector
1365-
that contains values, a key,
1366-
and an operator that relates
1367-
the key and values.
1368-
properties:
1369-
key:
1370-
description: key is the
1371-
label key that the selector
1372-
applies to.
1373-
type: string
1374-
operator:
1375-
description: operator represents
1376-
a key's relationship to
1377-
a set of values. Valid
1378-
operators are In, NotIn,
1379-
Exists and DoesNotExist.
1380-
type: string
1381-
values:
1382-
description: values is an
1383-
array of string values.
1384-
If the operator is In
1385-
or NotIn, the values array
1386-
must be non-empty. If
1387-
the operator is Exists
1388-
or DoesNotExist, the values
1389-
array must be empty. This
1390-
array is replaced during
1391-
a strategic merge patch.
1392-
items:
1393-
type: string
1394-
type: array
1395-
required:
1396-
- key
1397-
- operator
1398-
type: object
1399-
type: array
1400-
matchLabels:
1401-
additionalProperties:
1402-
type: string
1403-
description: matchLabels is a
1404-
map of {key,value} pairs. A
1405-
single {key,value} in the matchLabels
1406-
map is equivalent to an element
1407-
of matchExpressions, whose key
1408-
field is "key", the operator
1409-
is "In", and the values array
1410-
contains only "value". The requirements
1411-
are ANDed.
1412-
type: object
1413-
type: object
1414-
x-kubernetes-map-type: atomic
1415-
name:
1416-
description: Select a single ClusterTrustBundle
1417-
by object name. Mutually-exclusive
1418-
with signerName and labelSelector.
1419-
type: string
1420-
optional:
1421-
description: If true, don't block
1422-
pod startup if the referenced ClusterTrustBundle(s)
1423-
aren't available. If using name,
1424-
then the named ClusterTrustBundle
1425-
is allowed not to exist. If using
1426-
signerName, then the combination
1427-
of signerName and labelSelector
1428-
is allowed to match zero ClusterTrustBundles.
1429-
type: boolean
1430-
path:
1431-
description: Relative path from the
1432-
volume root to write the bundle.
1433-
type: string
1434-
signerName:
1435-
description: Select all ClusterTrustBundles
1436-
that match this signer name. Mutually-exclusive
1437-
with name. The contents of all
1438-
selected ClusterTrustBundles will
1439-
be unified and deduplicated.
1440-
type: string
1441-
required:
1442-
- path
1443-
type: object
14441330
configMap:
14451331
description: configMap information about
14461332
the configMap data to project

‎api/go.mod‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ require (
1818
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
1919
github.com/fsnotify/fsnotify v1.7.0 // indirect
2020
github.com/go-logr/logr v1.4.1 // indirect
21+
github.com/go-logr/zapr v1.3.0 // indirect
2122
github.com/go-openapi/jsonpointer v0.20.2 // indirect
2223
github.com/go-openapi/jsonreference v0.20.4 // indirect
2324
github.com/go-openapi/swag v0.22.9 // indirect
@@ -41,11 +42,11 @@ require (
4142
github.com/prometheus/common v0.46.0 // indirect
4243
github.com/prometheus/procfs v0.12.0 // indirect
4344
github.com/spf13/pflag v1.0.5 // indirect
44-
golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 // indirect
45-
golang.org/x/net v0.20.0 // indirect
46-
golang.org/x/oauth2 v0.16.0 // indirect
47-
golang.org/x/sys v0.16.0 // indirect
48-
golang.org/x/term v0.16.0 // indirect
45+
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a // indirect
46+
golang.org/x/net v0.21.0 // indirect
47+
golang.org/x/oauth2 v0.17.0 // indirect
48+
golang.org/x/sys v0.17.0 // indirect
49+
golang.org/x/term v0.17.0 // indirect
4950
golang.org/x/text v0.14.0 // indirect
5051
golang.org/x/time v0.5.0 // indirect
5152
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
@@ -58,7 +59,7 @@ require (
5859
k8s.io/client-go v0.28.3 // indirect
5960
k8s.io/component-base v0.28.3 // indirect
6061
k8s.io/klog/v2 v2.120.1 // indirect
61-
k8s.io/kube-openapi v0.0.0-20240126223410-2919ad4fcfec // indirect
62+
k8s.io/kube-openapi v0.0.0-20240209001042-7a0d5b415232 // indirect
6263
k8s.io/utils v0.0.0-20240102154912-e7106e64919e // indirect
6364
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
6465
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect

0 commit comments

Comments
 (0)