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.

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

LOG-1701: Update to client.go to v1.22 #1219

Merged
merged 1 commit into from
Oct 19, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
45 changes: 26 additions & 19 deletions bundle/manifests/logging.openshift.io_clusterloggings_crd.yaml

Large diffs are not rendered by default.

45 changes: 26 additions & 19 deletions config/crd/bases/logging.openshift.io_clusterloggings.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ metadata:
certified: "false"
containerImage: quay.io/openshift-logging/cluster-logging-operator:latest
createdAt: "2018-08-01T08:00:00Z"
description: The Red Hat OpenShift Logging Operator for OCP provides a means for configuring and managing your aggregated logging stack.
description: The Red Hat OpenShift Logging Operator for OCP provides a means for
configuring and managing your aggregated logging stack.
olm.skipRange: '>=4.6.0-0 <5.3.0'
operatorframework.io/cluster-monitoring: "true"
operatorframework.io/suggested-namespace: openshift-logging
Expand All @@ -100,7 +101,15 @@ spec:
apiservicedefinitions: {}
customresourcedefinitions:
owned:
- description: "ClusterLogForwarder is an API to configure forwarding logs. \n You configure forwarding by specifying a list of `pipelines`, which forward from a set of named inputs to a set of named outputs. \n There are built-in input names for common log categories, and you can define custom inputs to do additional filtering. \n There is a built-in output name for the default openshift log store, but you can define your own outputs with a URL and other connection information to forward logs to other stores or processors, inside or outside the cluster. \n For more details see the documentation on the API fields."
- description: "ClusterLogForwarder is an API to configure forwarding logs. \n
You configure forwarding by specifying a list of `pipelines`, which forward
from a set of named inputs to a set of named outputs. \n There are built-in
input names for common log categories, and you can define custom inputs to
do additional filtering. \n There is a built-in output name for the default
openshift log store, but you can define your own outputs with a URL and other
connection information to forward logs to other stores or processors, inside
or outside the cluster. \n For more details see the documentation on the API
fields."
displayName: Cluster Log Forwarder
kind: ClusterLogForwarder
name: clusterlogforwarders.logging.openshift.io
Expand Down
8 changes: 3 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,11 @@ require (
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
golang.org/x/tools v0.1.3 // indirect
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.21.2
k8s.io/apimachinery v0.21.2
k8s.io/api v0.22.2
k8s.io/apimachinery v0.22.2
k8s.io/client-go v12.0.0+incompatible
k8s.io/klog/v2 v2.9.0 // indirect
k8s.io/utils v0.0.0-20210629042839-4a2b36d8d73f // indirect
sigs.k8s.io/controller-runtime v0.9.2
sigs.k8s.io/yaml v1.2.0
)

replace k8s.io/client-go => k8s.io/client-go v0.21.2 // Required by prometheus-operator
replace k8s.io/client-go => k8s.io/client-go v0.22.2 // Required by prometheus-operator
43 changes: 26 additions & 17 deletions go.sum

Large diffs are not rendered by default.

45 changes: 26 additions & 19 deletions manifests/5.3/logging.openshift.io_clusterloggings_crd.yaml

Large diffs are not rendered by default.

22 changes: 15 additions & 7 deletions vendor/github.com/form3tech-oss/jwt-go/map_claims.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 0 additions & 23 deletions vendor/github.com/hashicorp/golang-lru/.gitignore

This file was deleted.

223 changes: 0 additions & 223 deletions vendor/github.com/hashicorp/golang-lru/2q.go

This file was deleted.