Skip to content

Commit

Permalink
Merge pull request #1370 from anik120/bump-k8s-1.17-rm-k/k
Browse files Browse the repository at this point in the history 
chore(deps): bump to kube 1.17.3
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Mar 24, 2020
2 parents 94ead7c + 57b580e commit 915c118
Show file tree
Hide file tree
Showing 927 changed files with 71,567 additions and 36,079 deletions.
42 changes: 18 additions & 24 deletions deploy/chart/crds/0000_50_olm_03-clusterserviceversion.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1827,7 +1827,8 @@ spec:
metadata.namespace, metadata.labels,
metadata.annotations, spec.nodeName,
spec.serviceAccountName,
status.hostIP, status.podIP.'
status.hostIP, status.podIP,
status.podIPs.'
type: object
required:
- fieldPath
Expand Down Expand Up @@ -2781,10 +2782,9 @@ spec:
and PodSecurityContext, the
value specified in SecurityContext
takes precedence. This field
is alpha-level and it is only
honored by servers that enable
the WindowsRunAsUserName feature
flag.
is beta-level and may be disabled
with the WindowsRunAsUserName
feature flag.
type: string
startupProbe:
description: 'StartupProbe indicates
Expand Down Expand Up @@ -3084,7 +3084,6 @@ spec:
environment. Defaults to ""
(volume's root). SubPathExpr
and SubPath are mutually exclusive.
This field is beta in 1.15.
type: string
workingDir:
description: Container's working directory.
Expand Down Expand Up @@ -3291,7 +3290,8 @@ spec:
metadata.namespace, metadata.labels,
metadata.annotations, spec.nodeName,
spec.serviceAccountName,
status.hostIP, status.podIP.'
status.hostIP, status.podIP,
status.podIPs.'
type: object
required:
- fieldPath
Expand Down Expand Up @@ -4225,10 +4225,9 @@ spec:
and PodSecurityContext, the
value specified in SecurityContext
takes precedence. This field
is alpha-level and it is only
honored by servers that enable
the WindowsRunAsUserName feature
flag.
is beta-level and may be disabled
with the WindowsRunAsUserName
feature flag.
type: string
startupProbe:
description: Probes are not allowed
Expand Down Expand Up @@ -4526,7 +4525,6 @@ spec:
environment. Defaults to ""
(volume's root). SubPathExpr
and SubPath are mutually exclusive.
This field is beta in 1.15.
type: string
workingDir:
description: Container's working directory.
Expand Down Expand Up @@ -4732,7 +4730,8 @@ spec:
metadata.namespace, metadata.labels,
metadata.annotations, spec.nodeName,
spec.serviceAccountName,
status.hostIP, status.podIP.'
status.hostIP, status.podIP,
status.podIPs.'
type: object
required:
- fieldPath
Expand Down Expand Up @@ -5686,10 +5685,9 @@ spec:
and PodSecurityContext, the
value specified in SecurityContext
takes precedence. This field
is alpha-level and it is only
honored by servers that enable
the WindowsRunAsUserName feature
flag.
is beta-level and may be disabled
with the WindowsRunAsUserName
feature flag.
type: string
startupProbe:
description: 'StartupProbe indicates
Expand Down Expand Up @@ -5989,7 +5987,6 @@ spec:
environment. Defaults to ""
(volume's root). SubPathExpr
and SubPath are mutually exclusive.
This field is beta in 1.15.
type: string
workingDir:
description: Container's working directory.
Expand Down Expand Up @@ -6259,9 +6256,8 @@ spec:
If set in both SecurityContext and
PodSecurityContext, the value specified
in SecurityContext takes precedence.
This field is alpha-level and it
is only honored by servers that
enable the WindowsRunAsUserName
This field is beta-level and may
be disabled with the WindowsRunAsUserName
feature flag.
type: string
serviceAccount:
Expand All @@ -6283,9 +6279,7 @@ spec:
process in each container will not be assigned
PID 1. HostPID and ShareProcessNamespace
cannot both be set. Optional: Default to
false. This field is beta-level and may
be disabled with the PodShareProcessNamespace
feature.'
false.'
type: boolean
subdomain:
description: If specified, the fully qualified
Expand Down
4 changes: 2 additions & 2 deletions deploy/chart/crds/0000_50_olm_05-subscription.crd.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ spec:
description: 'Selects a field of the pod: supports metadata.name,
metadata.namespace, metadata.labels, metadata.annotations,
spec.nodeName, spec.serviceAccountName, status.hostIP,
status.podIP.'
status.podIP, status.podIPs.'
type: object
required:
- fieldPath
Expand Down Expand Up @@ -370,7 +370,7 @@ spec:
to SubPath but environment variable references $(VAR_NAME)
are expanded using the container's environment. Defaults
to "" (volume's root). SubPathExpr and SubPath are mutually
exclusive. This field is beta in 1.15.
exclusive.
type: string
volumes:
description: List of Volumes to set in the podSpec.
Expand Down
56 changes: 16 additions & 40 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ go 1.12
require (
github.com/blang/semver v3.5.1+incompatible
github.com/coreos/go-semver v0.3.0
github.com/davecgh/go-spew v1.1.1
github.com/fsnotify/fsnotify v1.4.7
github.com/ghodss/yaml v1.0.0
github.com/go-openapi/spec v0.19.4
Expand All @@ -14,10 +15,10 @@ require (
github.com/mitchellh/hashstructure v1.0.0
github.com/onsi/ginkgo v1.10.1
github.com/onsi/gomega v1.7.0
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
github.com/openshift/api v0.0.0-20200205133042-34f0ec8dab87
github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
github.com/operator-framework/operator-registry v1.5.8
github.com/otiai10/copy v1.0.1
github.com/operator-framework/operator-registry v1.6.1
github.com/otiai10/copy v1.0.2
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.2.1
github.com/sirupsen/logrus v1.4.2
Expand All @@ -26,19 +27,19 @@ require (
golang.org/x/sys v0.0.0-20191210023423-ac6580df4449 // indirect
golang.org/x/time v0.0.0-20191024005414-555d28b269f0
google.golang.org/grpc v1.27.0
gopkg.in/yaml.v2 v2.2.4
gopkg.in/yaml.v2 v2.2.8
helm.sh/helm/v3 v3.1.2
k8s.io/api v0.17.2
k8s.io/apiextensions-apiserver v0.17.2
k8s.io/apimachinery v0.17.2
k8s.io/apiserver v0.0.0
k8s.io/client-go v8.0.0+incompatible
k8s.io/code-generator v0.0.0
k8s.io/component-base v0.0.0
k8s.io/api v0.17.3
k8s.io/apiextensions-apiserver v0.17.3
k8s.io/apimachinery v0.17.3
k8s.io/apiserver v0.17.3
k8s.io/client-go v0.17.3
k8s.io/code-generator v0.17.3
k8s.io/component-base v0.17.3
k8s.io/klog v1.0.0
k8s.io/kube-aggregator v0.0.0
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
k8s.io/kubernetes v1.16.0
k8s.io/kube-aggregator v0.17.3
k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a
rsc.io/letsencrypt v0.0.3 // indirect
sigs.k8s.io/controller-tools v0.2.4
)

Expand All @@ -49,30 +50,5 @@ replace (
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829
google.golang.org/grpc => google.golang.org/grpc v1.26.0 // https://github.com/etcd-io/etcd/issues/11563

// Pin to kube 1.16
k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918162238-f783a3654da8
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918163234-a9c1f33e9fb9
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918163402-db86a8c7bb21
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918162944-7a93a0ddadd8
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918162534-de037b596c1e
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918162820-3b5c1246eb18
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918162654-250a1838aa2c
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918163543-cfa506e53441
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918162108-227c654b2546
k8s.io/node-api => k8s.io/node-api v0.0.0-20190918163711-2299658ad911
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918161442-d4c9c65c82af
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190918162410-e45c26d066f2
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190918161628-92eb3cb7496c
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06
)

0 comments on commit 915c118

Please sign in to comment.