Skip to content

Commit e2656c8

Browse files
damdodamdo
committed
UPSTREAM: <carry>: container fallback to logs on error
1 parent e9732a4 commit e2656c8

File tree

1,374 files changed

+77076
-23900
lines changed

Some content is hidden

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

1,374 files changed

+77076
-23900
lines changed

‎openshift/manifests/0000_30_cluster-api_04_cm.core-cluster-api.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,7 @@ data:
496496
- --leader-elect
497497
- --diagnostics-address=${CAPI_DIAGNOSTICS_ADDRESS:=:8443}
498498
- --insecure-diagnostics=${CAPI_INSECURE_DIAGNOSTICS:=false}
499+
- --feature-gates=MachinePool=${EXP_MACHINE_POOL:=false},ClusterResourceSet=${EXP_CLUSTER_RESOURCE_SET:=false},ClusterTopology=${CLUSTER_TOPOLOGY:=false},RuntimeSDK=${EXP_RUNTIME_SDK:=false},MachineSetPreflightChecks=${EXP_MACHINE_SET_PREFLIGHT_CHECKS:=false}
499500
command:
500501
- /manager
501502
env:
@@ -544,6 +545,7 @@ data:
544545
privileged: false
545546
runAsGroup: 65532
546547
runAsUser: 65532
548+
terminationMessagePolicy: FallbackToLogsOnError
547549
volumeMounts:
548550
- mountPath: /tmp/k8s-webhook-server/serving-certs
549551
name: cert

‎openshift/tools/go.mod‎

Lines changed: 49 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,39 @@ module tools
22

33
go 1.18
44

5-
require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240216070530-91b37162630f
5+
require github.com/openshift/cluster-capi-operator/manifests-gen v0.0.0-20240502112228-a24f1aeb106b
66

77
require (
88
github.com/MakeNowJust/heredoc v1.0.0 // indirect
9+
github.com/ProtonMail/go-crypto v0.0.0-20230217124315-7d5c6f04bbb8 // indirect
910
github.com/adrg/xdg v0.4.0 // indirect
1011
github.com/beorn7/perks v1.0.1 // indirect
11-
github.com/blang/semver v3.5.1+incompatible // indirect
1212
github.com/blang/semver/v4 v4.0.0 // indirect
1313
github.com/cespare/xxhash/v2 v2.2.0 // indirect
14-
github.com/coredns/caddy v1.1.1 // indirect
15-
github.com/coredns/corefile-migration v1.0.21 // indirect
16-
github.com/davecgh/go-spew v1.1.1 // indirect
17-
github.com/docker/distribution v2.8.2+incompatible // indirect
14+
github.com/cloudflare/circl v1.3.7 // indirect
15+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
16+
github.com/distribution/reference v0.5.0 // indirect
1817
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
19-
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
18+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
2019
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
21-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
20+
github.com/evanphx/json-patch/v5 v5.7.0 // indirect
2221
github.com/fsnotify/fsnotify v1.6.0 // indirect
2322
github.com/go-errors/errors v1.4.2 // indirect
24-
github.com/go-logr/logr v1.2.4 // indirect
23+
github.com/go-logr/logr v1.3.0 // indirect
2524
github.com/go-openapi/jsonpointer v0.19.6 // indirect
26-
github.com/go-openapi/jsonreference v0.20.1 // indirect
25+
github.com/go-openapi/jsonreference v0.20.2 // indirect
2726
github.com/go-openapi/swag v0.22.3 // indirect
2827
github.com/gobuffalo/flect v1.0.2 // indirect
2928
github.com/gogo/protobuf v1.3.2 // indirect
3029
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3130
github.com/golang/protobuf v1.5.3 // indirect
32-
github.com/google/gnostic v0.6.9 // indirect
33-
github.com/google/go-cmp v0.5.9 // indirect
34-
github.com/google/go-github/v48 v48.2.0 // indirect
31+
github.com/google/gnostic-models v0.6.8 // indirect
32+
github.com/google/go-cmp v0.6.0 // indirect
33+
github.com/google/go-github/v53 v53.2.0 // indirect
3534
github.com/google/go-querystring v1.1.0 // indirect
3635
github.com/google/gofuzz v1.2.0 // indirect
3736
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
38-
github.com/google/uuid v1.3.0 // indirect
37+
github.com/google/uuid v1.3.1 // indirect
3938
github.com/hashicorp/hcl v1.0.0 // indirect
4039
github.com/imdario/mergo v0.3.13 // indirect
4140
github.com/jetstack/cert-manager v1.5.5 // indirect
@@ -50,48 +49,52 @@ require (
5049
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
5150
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5251
github.com/opencontainers/go-digest v1.0.0 // indirect
53-
github.com/pelletier/go-toml/v2 v2.0.8 // indirect
52+
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
5453
github.com/pkg/errors v0.9.1 // indirect
55-
github.com/prometheus/client_golang v1.16.0 // indirect
56-
github.com/prometheus/client_model v0.4.0 // indirect
57-
github.com/prometheus/common v0.42.0 // indirect
58-
github.com/prometheus/procfs v0.10.1 // indirect
59-
github.com/spf13/afero v1.9.5 // indirect
54+
github.com/prometheus/client_golang v1.17.0 // indirect
55+
github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
56+
github.com/prometheus/common v0.44.0 // indirect
57+
github.com/prometheus/procfs v0.11.1 // indirect
58+
github.com/sagikazarmark/locafero v0.3.0 // indirect
59+
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
60+
github.com/sourcegraph/conc v0.3.0 // indirect
61+
github.com/spf13/afero v1.10.0 // indirect
6062
github.com/spf13/cast v1.5.1 // indirect
61-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
6263
github.com/spf13/pflag v1.0.5 // indirect
63-
github.com/spf13/viper v1.16.0 // indirect
64-
github.com/subosito/gotenv v1.4.2 // indirect
65-
github.com/xlab/treeprint v1.1.0 // indirect
66-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
67-
golang.org/x/crypto v0.14.0 // indirect
68-
golang.org/x/net v0.17.0 // indirect
69-
golang.org/x/oauth2 v0.11.0 // indirect
70-
golang.org/x/sys v0.13.0 // indirect
71-
golang.org/x/term v0.13.0 // indirect
72-
golang.org/x/text v0.13.0 // indirect
64+
github.com/spf13/viper v1.17.0 // indirect
65+
github.com/subosito/gotenv v1.6.0 // indirect
66+
github.com/xlab/treeprint v1.2.0 // indirect
67+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
68+
go.uber.org/multierr v1.11.0 // indirect
69+
golang.org/x/crypto v0.17.0 // indirect
70+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
71+
golang.org/x/net v0.19.0 // indirect
72+
golang.org/x/oauth2 v0.14.0 // indirect
73+
golang.org/x/sys v0.15.0 // indirect
74+
golang.org/x/term v0.15.0 // indirect
75+
golang.org/x/text v0.14.0 // indirect
7376
golang.org/x/time v0.3.0 // indirect
74-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
77+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
7578
google.golang.org/appengine v1.6.7 // indirect
7679
google.golang.org/protobuf v1.31.0 // indirect
7780
gopkg.in/inf.v0 v0.9.1 // indirect
7881
gopkg.in/ini.v1 v1.67.0 // indirect
7982
gopkg.in/yaml.v2 v2.4.0 // indirect
8083
gopkg.in/yaml.v3 v3.0.1 // indirect
81-
k8s.io/api v0.27.6 // indirect
82-
k8s.io/apiextensions-apiserver v0.27.6 // indirect
83-
k8s.io/apimachinery v0.27.6 // indirect
84-
k8s.io/client-go v0.27.6 // indirect
85-
k8s.io/cluster-bootstrap v0.27.2 // indirect
86-
k8s.io/component-base v0.27.6 // indirect
87-
k8s.io/klog/v2 v2.90.1 // indirect
88-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
89-
k8s.io/utils v0.0.0-20230209194617-a36077c30491 // indirect
90-
sigs.k8s.io/cluster-api v1.5.2 // indirect
91-
sigs.k8s.io/controller-runtime v0.15.2 // indirect
84+
k8s.io/api v0.28.6 // indirect
85+
k8s.io/apiextensions-apiserver v0.28.6 // indirect
86+
k8s.io/apimachinery v0.28.6 // indirect
87+
k8s.io/client-go v0.28.6 // indirect
88+
k8s.io/cluster-bootstrap v0.28.4 // indirect
89+
k8s.io/component-base v0.28.6 // indirect
90+
k8s.io/klog/v2 v2.100.1 // indirect
91+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
92+
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
93+
sigs.k8s.io/cluster-api v1.6.2 // indirect
94+
sigs.k8s.io/controller-runtime v0.16.5 // indirect
9295
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
93-
sigs.k8s.io/kustomize/api v0.13.2 // indirect
94-
sigs.k8s.io/kustomize/kyaml v0.14.1 // indirect
96+
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 // indirect
97+
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
9598
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
96-
sigs.k8s.io/yaml v1.3.0 // indirect
99+
sigs.k8s.io/yaml v1.4.0 // indirect
97100
)

0 commit comments

Comments
 (0)