Skip to content

Commit

Permalink
Merge branch 'master' into projquay-6007
Browse files Browse the repository at this point in the history
  • Loading branch information
@jonathankingfc
jonathankingfc committed Nov 27, 2023
2 parents 9084d5f + 4e1c65e commit 6e4aacd
Show file tree
Hide file tree
Showing 7 changed files with 60 additions and 67 deletions.
6 changes: 1 addition & 5 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,7 @@ controller-gen:
ifeq (, $(shell which controller-gen))
@{ \
set -e ;\
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.13.0;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
else
Expand Down
1 change: 0 additions & 1 deletion apis/quay/v1/zz_generated.deepcopy.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 22 additions & 24 deletions bundle/manifests/quayregistries.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.13.0
name: quayregistries.quay.redhat.com
spec:
group: quay.redhat.com
Expand Down Expand Up @@ -166,6 +165,7 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
weight:
description: Weight associated with matching
the corresponding nodeSelectorTerm, in the
Expand Down Expand Up @@ -276,10 +276,12 @@ spec:
type: object
type: array
type: object
x-kubernetes-map-type: atomic
type: array
required:
- nodeSelectorTerms
type: object
x-kubernetes-map-type: atomic
type: object
podAffinity:
description: Describes pod affinity scheduling rules
Expand Down Expand Up @@ -366,6 +368,7 @@ spec:
ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the set
of namespaces that the term applies
Expand All @@ -375,9 +378,6 @@ spec:
field. null selector and null or empty
namespaces list means "this pod's namespace".
An empty selector ({}) matches all namespaces.
This field is beta-level and is only
honored when PodAffinityNamespaceSelector
feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a
Expand Down Expand Up @@ -432,6 +432,7 @@ spec:
ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a static
list of namespace names that the term
Expand All @@ -440,7 +441,7 @@ spec:
field and the ones selected by namespaceSelector.
null or empty namespaces list and null
namespaceSelector means "this pod's
namespace"
namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -542,6 +543,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the set of
namespaces that the term applies to. The
Expand All @@ -550,9 +552,7 @@ spec:
in the namespaces field. null selector and
null or empty namespaces list means "this
pod's namespace". An empty selector ({})
matches all namespaces. This field is beta-level
and is only honored when PodAffinityNamespaceSelector
feature is enabled.
matches all namespaces.
properties:
matchExpressions:
description: matchExpressions is a list
Expand Down Expand Up @@ -602,14 +602,15 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a static
list of namespace names that the term applies
to. The term is applied to the union of
the namespaces listed in this field and
the ones selected by namespaceSelector.
null or empty namespaces list and null namespaceSelector
means "this pod's namespace"
means "this pod's namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -714,6 +715,7 @@ spec:
ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the set
of namespaces that the term applies
Expand All @@ -723,9 +725,6 @@ spec:
field. null selector and null or empty
namespaces list means "this pod's namespace".
An empty selector ({}) matches all namespaces.
This field is beta-level and is only
honored when PodAffinityNamespaceSelector
feature is enabled.
properties:
matchExpressions:
description: matchExpressions is a
Expand Down Expand Up @@ -780,6 +779,7 @@ spec:
ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a static
list of namespace names that the term
Expand All @@ -788,7 +788,7 @@ spec:
field and the ones selected by namespaceSelector.
null or empty namespaces list and null
namespaceSelector means "this pod's
namespace"
namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -891,6 +891,7 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaceSelector:
description: A label query over the set of
namespaces that the term applies to. The
Expand All @@ -899,9 +900,7 @@ spec:
in the namespaces field. null selector and
null or empty namespaces list means "this
pod's namespace". An empty selector ({})
matches all namespaces. This field is beta-level
and is only honored when PodAffinityNamespaceSelector
feature is enabled.
matches all namespaces.
properties:
matchExpressions:
description: matchExpressions is a list
Expand Down Expand Up @@ -951,14 +950,15 @@ spec:
only "value". The requirements are ANDed.
type: object
type: object
x-kubernetes-map-type: atomic
namespaces:
description: namespaces specifies a static
list of namespace names that the term applies
to. The term is applied to the union of
the namespaces listed in this field and
the ones selected by namespaceSelector.
null or empty namespaces list and null namespaceSelector
means "this pod's namespace"
means "this pod's namespace".
items:
type: string
type: array
Expand Down Expand Up @@ -1028,6 +1028,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
fieldRef:
description: 'Selects a field of the pod: supports
metadata.name, metadata.namespace, `metadata.labels[''<KEY>'']`,
Expand All @@ -1046,6 +1047,7 @@ spec:
required:
- fieldPath
type: object
x-kubernetes-map-type: atomic
resourceFieldRef:
description: 'Selects a resource of the container:
only resources limits and requests (limits.cpu,
Expand All @@ -1071,6 +1073,7 @@ spec:
required:
- resource
type: object
x-kubernetes-map-type: atomic
secretKeyRef:
description: Selects a key of a secret in the
pod's namespace
Expand All @@ -1092,6 +1095,7 @@ spec:
required:
- key
type: object
x-kubernetes-map-type: atomic
type: object
required:
- name
Expand Down Expand Up @@ -1178,9 +1182,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []

0 comments on commit 6e4aacd

Please sign in to comment.