Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump controller-tools #2497

Merged
merged 19 commits into from
Mar 2, 2020
Merged

Bump controller-tools #2497

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
5a17b13
Update ctrl tools to 0.2.5
anyasabo Jan 30, 2020
5d68e0c
Regenerate CRDs
anyasabo Jan 30, 2020
9d3aaa8
Add ns to unit tests
anyasabo Jan 30, 2020
eba9446
Remove int or string property
anyasabo Jan 31, 2020
5213664
Remove other x-kube properties
anyasabo Jan 31, 2020
9fe69bb
Validate controller-gen version
anyasabo Jan 31, 2020
e121977
Regen api docs
anyasabo Jan 31, 2020
c83b8f0
go mod tidy
anyasabo Feb 3, 2020
f3f2623
Merge master
anyasabo Feb 3, 2020
19ff402
Update notice
anyasabo Feb 3, 2020
07ca386
Merge master
anyasabo Feb 10, 2020
5a0d058
Regenerate notice
anyasabo Feb 11, 2020
3e2a353
go mod tidy and regen notice
anyasabo Feb 11, 2020
5aba5c7
Merge branch 'master' into bumpctrltools
anyasabo Feb 13, 2020
b1e3956
Update comments
anyasabo Feb 13, 2020
c643260
Merge branch 'master' into bumpctrltools
anyasabo Feb 14, 2020
8ef94b9
Merge master
anyasabo Feb 21, 2020
6957e47
Merge branch 'master' into bumpctrltools
anyasabo Feb 28, 2020
23db115
Merge master
anyasabo Mar 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@ GOBIN=$(shell go env GOBIN)
endif

# find or download controller-gen
# note this does not validate the version
controller-gen:
ifeq ($(shell command -v controller-gen),)
@(cd /tmp; GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.1)
ifneq ($(shell controller-gen --version), Version: v0.2.5)
@(cd /tmp; GO111MODULE=on go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.2.5)
CONTROLLER_GEN=$(GOBIN)/controller-gen
else
CONTROLLER_GEN=$(shell which controller-gen)
Expand Down
68 changes: 27 additions & 41 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -572,10 +572,10 @@ SOFTWARE.

--------------------------------------------------------------------------------
Module : github.com/gobuffalo/flect
Version : v0.1.5
Time : 2019-06-13 21:51:46 +0000 UTC
Version : v0.2.0
Time : 2019-12-17 15:22:31 +0000 UTC

Contents of probable licence file $GOMODCACHE/github.com/gobuffalo/flect@v0.1.5/LICENSE:
Contents of probable licence file $GOMODCACHE/github.com/gobuffalo/flect@v0.2.0/LICENSE:

The MIT License (MIT)

Expand Down Expand Up @@ -2539,43 +2539,29 @@ Module : gotest.tools
Version : v2.2.0+incompatible
Time : 2018-11-11 18:29:05 +0000 UTC

Contents of probable licence file $GOMODCACHE/gotest.tools@v2.2.0+incompatible/internal/difflib/LICENSE:
Contents of probable licence file $GOMODCACHE/gotest.tools@v2.2.0+incompatible/LICENSE:

Copyright (c) 2013, Patrick Mezard
All rights reserved.
Copyright 2018 gotest.tools authors

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
met:
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.
Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
The names of its contributors may not be used to endorse or promote
products derived from this software without specific prior written
permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.


--------------------------------------------------------------------------------
Module : k8s.io/api
Version : v0.0.0-20191114100352-16d7abae0d2a
Time : 2019-11-14 10:03:52 +0000 UTC
Version : v0.17.0
Time : 2019-12-10 23:01:29 +0000 UTC

Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.0.0-20191114100352-16d7abae0d2a/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.17.0/LICENSE:


Apache License
Expand Down Expand Up @@ -2783,10 +2769,10 @@ Contents of probable licence file $GOMODCACHE/k8s.io/api@v0.0.0-20191114100352-1

--------------------------------------------------------------------------------
Module : k8s.io/apimachinery
Version : v0.0.0-20191028221656-72ed19daf4bb
Time : 2019-10-28 22:16:56 +0000 UTC
Version : v0.17.0
Time : 2019-11-21 17:54:48 +0000 UTC

Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.0.0-20191028221656-72ed19daf4bb/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.17.0/LICENSE:


Apache License
Expand Down Expand Up @@ -2994,10 +2980,10 @@ Contents of probable licence file $GOMODCACHE/k8s.io/apimachinery@v0.0.0-2019102

--------------------------------------------------------------------------------
Module : k8s.io/client-go
Version : v0.0.0-20191114101535-6c5935290e33
Time : 2019-11-14 10:15:35 +0000 UTC
Version : v0.17.0
Time : 2019-12-10 23:09:07 +0000 UTC

Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.0.0-20191114101535-6c5935290e33/LICENSE:
Contents of probable licence file $GOMODCACHE/k8s.io/client-go@v0.17.0/LICENSE:


Apache License
Expand Down Expand Up @@ -3615,10 +3601,10 @@ Contents of probable licence file $GOMODCACHE/sigs.k8s.io/controller-runtime@v0.

--------------------------------------------------------------------------------
Module : sigs.k8s.io/controller-tools
Version : v0.2.4
Time : 2019-11-19 20:17:20 +0000 UTC
Version : v0.2.5
Time : 2020-01-29 21:54:14 +0000 UTC

Contents of probable licence file $GOMODCACHE/sigs.k8s.io/controller-tools@v0.2.4/LICENSE:
Contents of probable licence file $GOMODCACHE/sigs.k8s.io/controller-tools@v0.2.5/LICENSE:

Apache License
Version 2.0, January 2004
Expand Down
85 changes: 77 additions & 8 deletions config/crds/all-crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.5
creationTimestamp: null
name: apmservers.apm.k8s.elastic.co
spec:
Expand Down Expand Up @@ -204,8 +206,8 @@ spec:
type: string
targetPort:
anyOf:
- type: string
- type: integer
- type: string
description: 'Number or name of the port to access
on the pods targeted by the service. Number must
be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
Expand Down Expand Up @@ -262,6 +264,24 @@ spec:
type: integer
type: object
type: object
topologyKeys:
description: topologyKeys is a preference-order list of
topology keys which implementations of services should
use to preferentially sort endpoints when accessing this
Service, it can not be used at the same time as externalTrafficPolicy=Local.
Topology keys must be valid label keys and at most 16
keys may be specified. Endpoints are chosen based on the
first topology key with available backends. If this field
is specified and all entries have no backends that match
the topology of the client, the service has no backends
for that client and connections should fail. The special
value "*" may be used to mean "any topology". This catch-all
value, if used, only makes sense as the last value in
the list. If this is not specified or empty, no topology
constraints will be applied.
items:
type: string
type: array
type:
description: 'type determines how the Service is exposed.
Defaults to ClusterIP. Valid options are ExternalName,
Expand Down Expand Up @@ -419,6 +439,8 @@ status:
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.5
creationTimestamp: null
name: elasticsearches.elasticsearch.k8s.elastic.co
spec:
Expand Down Expand Up @@ -605,8 +627,8 @@ spec:
type: string
targetPort:
anyOf:
- type: string
- type: integer
- type: string
description: 'Number or name of the port to access
on the pods targeted by the service. Number must
be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
Expand Down Expand Up @@ -663,6 +685,24 @@ spec:
type: integer
type: object
type: object
topologyKeys:
description: topologyKeys is a preference-order list of
topology keys which implementations of services should
use to preferentially sort endpoints when accessing this
Service, it can not be used at the same time as externalTrafficPolicy=Local.
Topology keys must be valid label keys and at most 16
keys may be specified. Endpoints are chosen based on the
first topology key with available backends. If this field
is specified and all entries have no backends that match
the topology of the client, the service has no backends
for that client and connections should fail. The special
value "*" may be used to mean "any topology". This catch-all
value, if used, only makes sense as the last value in
the list. If this is not specified or empty, no topology
constraints will be applied.
items:
type: string
type: array
type:
description: 'type determines how the Service is exposed.
Defaults to ClusterIP. Valid options are ExternalName,
Expand Down Expand Up @@ -823,13 +863,19 @@ spec:
properties:
limits:
additionalProperties:
type: string
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
description: 'Limits describes the maximum amount
of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/'
type: object
requests:
additionalProperties:
type: string
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
description: 'Requests describes the minimum amount
of compute resources required. If Requests is
omitted for a container, it defaults to Limits
Expand Down Expand Up @@ -910,7 +956,10 @@ spec:
type: array
capacity:
additionalProperties:
type: string
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
description: Represents the actual resources of the
underlying volume.
type: object
Expand Down Expand Up @@ -980,17 +1029,17 @@ spec:
properties:
maxUnavailable:
anyOf:
- type: string
- type: integer
- type: string
description: An eviction is allowed if at most "maxUnavailable"
pods selected by "selector" are unavailable after the eviction,
i.e. even in absence of the evicted pod. For example, one
can prevent all voluntary evictions by specifying 0. This
is a mutually exclusive setting with "minAvailable".
minAvailable:
anyOf:
- type: string
- type: integer
- type: string
description: An eviction is allowed if at least "minAvailable"
pods selected by "selector" will still be available after
the eviction, i.e. even in the absence of the evicted pod. So
Expand Down Expand Up @@ -1153,6 +1202,8 @@ status:
apiVersion: apiextensions.k8s.io/v1beta1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.2.5
creationTimestamp: null
name: kibanas.kibana.k8s.elastic.co
spec:
Expand Down Expand Up @@ -1355,8 +1406,8 @@ spec:
type: string
targetPort:
anyOf:
- type: string
- type: integer
- type: string
description: 'Number or name of the port to access
on the pods targeted by the service. Number must
be in the range 1 to 65535. Name must be an IANA_SVC_NAME.
Expand Down Expand Up @@ -1413,6 +1464,24 @@ spec:
type: integer
type: object
type: object
topologyKeys:
description: topologyKeys is a preference-order list of
topology keys which implementations of services should
use to preferentially sort endpoints when accessing this
Service, it can not be used at the same time as externalTrafficPolicy=Local.
Topology keys must be valid label keys and at most 16
keys may be specified. Endpoints are chosen based on the
first topology key with available backends. If this field
is specified and all entries have no backends that match
the topology of the client, the service has no backends
for that client and connections should fail. The special
value "*" may be used to mean "any topology". This catch-all
value, if used, only makes sense as the last value in
the list. If this is not specified or empty, no topology
constraints will be applied.
items:
type: string
type: array
type:
description: 'type determines how the Service is exposed.
Defaults to ClusterIP. Valid options are ExternalName,
Expand Down
Loading