Skip to content

Commit f22d1c6

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #64 from deads2k/hardcoded-mapper
bug 2006945: extend hardcoded restmapper for cluster-bootstrap to avoid crashlooping bootstrap kube-apiserver
2 parents 252c2d3 + 53bd667 commit f22d1c6

1,535 files changed

Lines changed: 133980 additions & 27222 deletions

File tree

Some content is hidden

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

‎go.mod‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ go 1.13
55
require (
66
github.com/coreos/fcct v0.9.0
77
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32 // indirect
8-
github.com/googleapis/gnostic v0.5.1 // indirect
9-
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
10-
github.com/openshift/library-go v0.0.0-20210301154249-aa29957b8a9c
11-
github.com/spf13/cobra v1.1.1
12-
k8s.io/api v0.20.0
13-
k8s.io/apimachinery v0.20.0
14-
k8s.io/client-go v0.20.0
15-
k8s.io/klog/v2 v2.4.0
8+
github.com/openshift/build-machinery-go v0.0.0-20210806203541-4ea9b6da3a37
9+
github.com/openshift/library-go v0.0.0-20210923111424-158c870b7cc3
10+
github.com/spf13/cobra v1.1.3
11+
k8s.io/api v0.22.1
12+
k8s.io/apimachinery v0.22.1
13+
k8s.io/client-go v0.22.1
14+
k8s.io/klog/v2 v2.9.0
1615
)

‎go.sum‎

Lines changed: 213 additions & 73 deletions
Large diffs are not rendered by default.

‎vendor/github.com/coreos/go-systemd/v22/unit/deserialize.go‎

Lines changed: 85 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/coreos/go-systemd/v22/unit/section.go‎

Lines changed: 44 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/coreos/go-systemd/v22/unit/serialize.go‎

Lines changed: 23 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/go-logr/logr/README.md‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/go-logr/logr/discard.go‎

Lines changed: 51 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)