Skip to content

Commit 915c118

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #1370 from anik120/bump-k8s-1.17-rm-k/k
chore(deps): bump to kube 1.17.3
2 parents 94ead7c + 57b580e commit 915c118

File tree

927 files changed

+71567
-36079
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

927 files changed

+71567
-36079
lines changed

‎deploy/chart/crds/0000_50_olm_03-clusterserviceversion.crd.yaml

+18-24
Original file line numberDiff line numberDiff line change
@@ -1827,7 +1827,8 @@ spec:
18271827
metadata.namespace, metadata.labels,
18281828
metadata.annotations, spec.nodeName,
18291829
spec.serviceAccountName,
1830-
status.hostIP, status.podIP.'
1830+
status.hostIP, status.podIP,
1831+
status.podIPs.'
18311832
type: object
18321833
required:
18331834
- fieldPath
@@ -2781,10 +2782,9 @@ spec:
27812782
and PodSecurityContext, the
27822783
value specified in SecurityContext
27832784
takes precedence. This field
2784-
is alpha-level and it is only
2785-
honored by servers that enable
2786-
the WindowsRunAsUserName feature
2787-
flag.
2785+
is beta-level and may be disabled
2786+
with the WindowsRunAsUserName
2787+
feature flag.
27882788
type: string
27892789
startupProbe:
27902790
description: 'StartupProbe indicates
@@ -3084,7 +3084,6 @@ spec:
30843084
environment. Defaults to ""
30853085
(volume's root). SubPathExpr
30863086
and SubPath are mutually exclusive.
3087-
This field is beta in 1.15.
30883087
type: string
30893088
workingDir:
30903089
description: Container's working directory.
@@ -3291,7 +3290,8 @@ spec:
32913290
metadata.namespace, metadata.labels,
32923291
metadata.annotations, spec.nodeName,
32933292
spec.serviceAccountName,
3294-
status.hostIP, status.podIP.'
3293+
status.hostIP, status.podIP,
3294+
status.podIPs.'
32953295
type: object
32963296
required:
32973297
- fieldPath
@@ -4225,10 +4225,9 @@ spec:
42254225
and PodSecurityContext, the
42264226
value specified in SecurityContext
42274227
takes precedence. This field
4228-
is alpha-level and it is only
4229-
honored by servers that enable
4230-
the WindowsRunAsUserName feature
4231-
flag.
4228+
is beta-level and may be disabled
4229+
with the WindowsRunAsUserName
4230+
feature flag.
42324231
type: string
42334232
startupProbe:
42344233
description: Probes are not allowed
@@ -4526,7 +4525,6 @@ spec:
45264525
environment. Defaults to ""
45274526
(volume's root). SubPathExpr
45284527
and SubPath are mutually exclusive.
4529-
This field is beta in 1.15.
45304528
type: string
45314529
workingDir:
45324530
description: Container's working directory.
@@ -4732,7 +4730,8 @@ spec:
47324730
metadata.namespace, metadata.labels,
47334731
metadata.annotations, spec.nodeName,
47344732
spec.serviceAccountName,
4735-
status.hostIP, status.podIP.'
4733+
status.hostIP, status.podIP,
4734+
status.podIPs.'
47364735
type: object
47374736
required:
47384737
- fieldPath
@@ -5686,10 +5685,9 @@ spec:
56865685
and PodSecurityContext, the
56875686
value specified in SecurityContext
56885687
takes precedence. This field
5689-
is alpha-level and it is only
5690-
honored by servers that enable
5691-
the WindowsRunAsUserName feature
5692-
flag.
5688+
is beta-level and may be disabled
5689+
with the WindowsRunAsUserName
5690+
feature flag.
56935691
type: string
56945692
startupProbe:
56955693
description: 'StartupProbe indicates
@@ -5989,7 +5987,6 @@ spec:
59895987
environment. Defaults to ""
59905988
(volume's root). SubPathExpr
59915989
and SubPath are mutually exclusive.
5992-
This field is beta in 1.15.
59935990
type: string
59945991
workingDir:
59955992
description: Container's working directory.
@@ -6259,9 +6256,8 @@ spec:
62596256
If set in both SecurityContext and
62606257
PodSecurityContext, the value specified
62616258
in SecurityContext takes precedence.
6262-
This field is alpha-level and it
6263-
is only honored by servers that
6264-
enable the WindowsRunAsUserName
6259+
This field is beta-level and may
6260+
be disabled with the WindowsRunAsUserName
62656261
feature flag.
62666262
type: string
62676263
serviceAccount:
@@ -6283,9 +6279,7 @@ spec:
62836279
process in each container will not be assigned
62846280
PID 1. HostPID and ShareProcessNamespace
62856281
cannot both be set. Optional: Default to
6286-
false. This field is beta-level and may
6287-
be disabled with the PodShareProcessNamespace
6288-
feature.'
6282+
false.'
62896283
type: boolean
62906284
subdomain:
62916285
description: If specified, the fully qualified

‎deploy/chart/crds/0000_50_olm_05-subscription.crd.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ spec:
128128
description: 'Selects a field of the pod: supports metadata.name,
129129
metadata.namespace, metadata.labels, metadata.annotations,
130130
spec.nodeName, spec.serviceAccountName, status.hostIP,
131-
status.podIP.'
131+
status.podIP, status.podIPs.'
132132
type: object
133133
required:
134134
- fieldPath
@@ -370,7 +370,7 @@ spec:
370370
to SubPath but environment variable references $(VAR_NAME)
371371
are expanded using the container's environment. Defaults
372372
to "" (volume's root). SubPathExpr and SubPath are mutually
373-
exclusive. This field is beta in 1.15.
373+
exclusive.
374374
type: string
375375
volumes:
376376
description: List of Volumes to set in the podSpec.

‎go.mod

+16-40
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.12
55
require (
66
github.com/blang/semver v3.5.1+incompatible
77
github.com/coreos/go-semver v0.3.0
8+
github.com/davecgh/go-spew v1.1.1
89
github.com/fsnotify/fsnotify v1.4.7
910
github.com/ghodss/yaml v1.0.0
1011
github.com/go-openapi/spec v0.19.4
@@ -14,10 +15,10 @@ require (
1415
github.com/mitchellh/hashstructure v1.0.0
1516
github.com/onsi/ginkgo v1.10.1
1617
github.com/onsi/gomega v1.7.0
17-
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
18+
github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87
1819
github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
19-
github.com/operator-framework/operator-registry v1.5.8
20-
github.com/otiai10/copy v1.0.1
20+
github.com/operator-framework/operator-registry v1.6.1
21+
github.com/otiai10/copy v1.0.2
2122
github.com/pkg/errors v0.9.1
2223
github.com/prometheus/client_golang v1.2.1
2324
github.com/sirupsen/logrus v1.4.2
@@ -26,19 +27,19 @@ require (
2627
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
2728
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
2829
google.golang.org/grpc v1.27.0
29-
gopkg.in/yaml.v2 v2.2.4
30+
gopkg.in/yaml.v2 v2.2.8
3031
helm.sh/helm/v3 v3.1.2
31-
k8s.io/api v0.17.2
32-
k8s.io/apiextensions-apiserver v0.17.2
33-
k8s.io/apimachinery v0.17.2
34-
k8s.io/apiserver v0.0.0
35-
k8s.io/client-go v8.0.0+incompatible
36-
k8s.io/code-generator v0.0.0
37-
k8s.io/component-base v0.0.0
32+
k8s.io/api v0.17.3
33+
k8s.io/apiextensions-apiserver v0.17.3
34+
k8s.io/apimachinery v0.17.3
35+
k8s.io/apiserver v0.17.3
36+
k8s.io/client-go v0.17.3
37+
k8s.io/code-generator v0.17.3
38+
k8s.io/component-base v0.17.3
3839
k8s.io/klog v1.0.0
39-
k8s.io/kube-aggregator v0.0.0
40-
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
41-
k8s.io/kubernetes v1.16.0
40+
k8s.io/kube-aggregator v0.17.3
41+
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
42+
rsc.io/letsencrypt v0.0.3 // indirect
4243
sigs.k8s.io/controller-tools v0.2.4
4344
)
4445

@@ -49,30 +50,5 @@ replace (
4950
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
5051
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
5152
google.golang.org/grpc => google.golang.org/grpc v1.26.0 // https://github.com/etcd-io/etcd/issues/11563
52-
53-
// Pin to kube 1.16
54-
k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
55-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
56-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
57-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
58-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918162238-f783a3654da8
59-
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
60-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918163234-a9c1f33e9fb9
61-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
62-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
63-
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
64-
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
65-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918163402-db86a8c7bb21
66-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
67-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918162944-7a93a0ddadd8
68-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918162534-de037b596c1e
69-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918162820-3b5c1246eb18
70-
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
71-
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918162654-250a1838aa2c
72-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918163543-cfa506e53441
73-
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918162108-227c654b2546
74-
k8s.io/node-api => k8s.io/node-api v0.0.0-20190918163711-2299658ad911
75-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918161442-d4c9c65c82af
76-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190918162410-e45c26d066f2
77-
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190918161628-92eb3cb7496c
53+
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
7854
)

0 commit comments

Comments
 (0)