Skip to content

Commit a98fe8d

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #22 from skitt/dependency-upgrades-split
Dependency upgrades
2 parents 1790d0c + b247324 commit a98fe8d

File tree

14 files changed

+795
-624
lines changed

14 files changed

+795
-624
lines changed

‎cmd/servicecontroller/servicecontroller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ func main() {
5454
}
5555
ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
5656

57-
if err := controllers.Start(ctrl.GetConfigOrDie(), setupLog, opts, ctrl.SetupSignalHandler()); err != nil {
57+
if err := controllers.Start(ctrl.SetupSignalHandler(), ctrl.GetConfigOrDie(), setupLog, opts); err != nil {
5858
setupLog.Error(err, "problem running controllers")
5959
os.Exit(1)
6060
}

‎config/crd/multicluster.x-k8s.io_serviceexports.yaml

Lines changed: 73 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -23,111 +23,77 @@ spec:
2323
singular: serviceexport
2424
kind: ServiceExport
2525
shortNames:
26-
- svcex
26+
- svcex
2727
versions:
28-
- name: v1alpha1
29-
served: true
30-
storage: true
31-
subresources:
32-
status: {}
33-
additionalPrinterColumns:
34-
- name: Age
35-
type: date
36-
jsonPath: .metadata.creationTimestamp
37-
"schema":
38-
"openAPIV3Schema":
39-
description: ServiceExport declares that the Service with the same name and
40-
namespace as this export should be consumable from other clusters.
41-
type: object
42-
properties:
43-
apiVersion:
44-
description: 'APIVersion defines the versioned schema of this representation
45-
of an object. Servers should convert recognized schemas to the latest
46-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
47-
type: string
48-
kind:
49-
description: 'Kind is a string value representing the REST resource this
50-
object represents. Servers may infer this from the endpoint the client
51-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
52-
type: string
53-
metadata:
54-
type: object
55-
status:
56-
description: status describes the current state of an exported service.
57-
Service configuration comes from the Service that had the same name
58-
and namespace as this ServiceExport. Populated by the multi-cluster
59-
service implementation's controller.
60-
type: object
61-
properties:
62-
conditions:
63-
type: array
64-
items:
65-
description: "Condition contains details for one aspect of the current
66-
state of this API Resource. --- This struct is intended for direct
67-
use as an array at the field path .status.conditions. For example,
68-
type FooStatus struct{ // Represents the observations of a
69-
foo's current state. // Known .status.conditions.type are:
70-
\"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type
71-
\ // +patchStrategy=merge // +listType=map // +listMapKey=type
72-
\ Conditions []metav1.Condition `json:\"conditions,omitempty\"
73-
patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`
74-
\n // other fields }"
75-
type: object
76-
required:
77-
- lastTransitionTime
78-
- message
79-
- reason
80-
- status
81-
- type
82-
properties:
83-
lastTransitionTime:
84-
description: lastTransitionTime is the last time the condition
85-
transitioned from one status to another. This should be when
86-
the underlying condition changed. If that is not known, then
87-
using the time when the API field changed is acceptable.
88-
type: string
89-
format: date-time
90-
message:
91-
description: message is a human readable message indicating
92-
details about the transition. This may be an empty string.
93-
type: string
94-
maxLength: 32768
95-
observedGeneration:
96-
description: observedGeneration represents the .metadata.generation
97-
that the condition was set based upon. For instance, if .metadata.generation
98-
is currently 12, but the .status.conditions[x].observedGeneration
99-
is 9, the condition is out of date with respect to the current
100-
state of the instance.
101-
type: integer
102-
format: int64
103-
minimum: 0
104-
reason:
105-
description: reason contains a programmatic identifier indicating
106-
the reason for the condition's last transition. Producers
107-
of specific condition types may define expected values and
108-
meanings for this field, and whether the values are considered
109-
a guaranteed API. The value should be a CamelCase string.
110-
This field may not be empty.
111-
type: string
112-
maxLength: 1024
113-
minLength: 1
114-
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
115-
status:
116-
description: status of the condition, one of True, False, Unknown.
117-
type: string
118-
enum:
119-
- "True"
120-
- "False"
121-
- Unknown
122-
type:
123-
description: type of condition in CamelCase or in foo.example.com/CamelCase.
124-
--- Many .condition.type values are consistent across resources
125-
like Available, but because arbitrary conditions can be useful
126-
(see .node.status.conditions), the ability to deconflict is
127-
important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
128-
type: string
129-
maxLength: 316
130-
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])$
131-
x-kubernetes-list-map-keys:
132-
- type
133-
x-kubernetes-list-type: map
28+
- name: v1alpha1
29+
served: true
30+
storage: true
31+
subresources:
32+
status: {}
33+
additionalPrinterColumns:
34+
- name: Age
35+
type: date
36+
jsonPath: .metadata.creationTimestamp
37+
"schema":
38+
"openAPIV3Schema":
39+
description: ServiceExport declares that the Service with the same name and namespace as this export should be consumable from other clusters.
40+
type: object
41+
properties:
42+
apiVersion:
43+
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
44+
type: string
45+
kind:
46+
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
47+
type: string
48+
metadata:
49+
type: object
50+
status:
51+
description: status describes the current state of an exported service. Service configuration comes from the Service that had the same name and namespace as this ServiceExport. Populated by the multi-cluster service implementation's controller.
52+
type: object
53+
properties:
54+
conditions:
55+
type: array
56+
items:
57+
description: "Condition contains details for one aspect of the current state of this API Resource. --- This struct is intended for direct use as an array at the field path .status.conditions. For example, \n type FooStatus struct{ // Represents the observations of a foo's current state. // Known .status.conditions.type are: \"Available\", \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge // +listType=map // +listMapKey=type Conditions []metav1.Condition `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
58+
type: object
59+
required:
60+
- lastTransitionTime
61+
- message
62+
- reason
63+
- status
64+
- type
65+
properties:
66+
lastTransitionTime:
67+
description: lastTransitionTime is the last time the condition transitioned from one status to another. This should be when the underlying condition changed. If that is not known, then using the time when the API field changed is acceptable.
68+
type: string
69+
format: date-time
70+
message:
71+
description: message is a human readable message indicating details about the transition. This may be an empty string.
72+
type: string
73+
maxLength: 32768
74+
observedGeneration:
75+
description: observedGeneration represents the .metadata.generation that the condition was set based upon. For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date with respect to the current state of the instance.
76+
type: integer
77+
format: int64
78+
minimum: 0
79+
reason:
80+
description: reason contains a programmatic identifier indicating the reason for the condition's last transition. Producers of specific condition types may define expected values and meanings for this field, and whether the values are considered a guaranteed API. The value should be a CamelCase string. This field may not be empty.
81+
type: string
82+
maxLength: 1024
83+
minLength: 1
84+
pattern: ^[A-Za-z]([A-Za-z0-9_,:]*[A-Za-z0-9_])?$
85+
status:
86+
description: status of the condition, one of True, False, Unknown.
87+
type: string
88+
enum:
89+
- "True"
90+
- "False"
91+
- Unknown
92+
type:
93+
description: type of condition in CamelCase or in foo.example.com/CamelCase. --- Many .condition.type values are consistent across resources like Available, but because arbitrary conditions can be useful (see .node.status.conditions), the ability to deconflict is important. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
94+
type: string
95+
maxLength: 316
96+
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])$
97+
x-kubernetes-list-map-keys:
98+
- type
99+
x-kubernetes-list-type: map

0 commit comments

Comments
 (0)