Bug 1752725: Log into kibana console get 504 Gateway Time-out The server didn't respond in time. when http_proxy enabled
#255
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package constants | ||
|
|
||
| const ( | ||
| SingletonName = "instance" | ||
| OpenshiftNS = "openshift-logging" | ||
| // global proxy / trusted ca bundle consts | ||
| ProxyName = "cluster" | ||
| TrustedCABundleKey = "ca-bundle.crt" | ||
| InjectTrustedCABundleLabel = "config.openshift.io/inject-trusted-cabundle" | ||
| TrustedCABundleMountFile = "tls-ca-bundle.pem" | ||
| TrustedCABundleMountDir = "/etc/pki/ca-trust/extracted/pem/" | ||
| TrustedCABundleHashName = "logging.openshift.io/hash" | ||
| FluentdTrustedCAName = "fluentd-trusted-ca-bundle" | ||
| KibanaTrustedCAName = "kibana-trusted-ca-bundle" | ||
| // internal elasticsearch FQDN to prevent to connect to the global proxy | ||
| ElasticsearchFQDN = "elasticsearch.openshift-logging.svc.cluster.local" | ||
| ElasticsearchPort = "9200" | ||
| LogStoreService = ElasticsearchFQDN + ":" + ElasticsearchPort | ||
| ) | ||
|
|
||
| var ReconcileForGlobalProxyList = []string{FluentdTrustedCAName, KibanaTrustedCAName} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,156 @@ | ||
| package proxyconfig | ||
|
|
||
| import ( | ||
| "context" | ||
| "time" | ||
|
|
||
| configv1 "github.com/openshift/api/config/v1" | ||
| loggingv1 "github.com/openshift/cluster-logging-operator/pkg/apis/logging/v1" | ||
| logforwarding "github.com/openshift/cluster-logging-operator/pkg/apis/logging/v1alpha1" | ||
| "github.com/openshift/cluster-logging-operator/pkg/constants" | ||
| "github.com/openshift/cluster-logging-operator/pkg/k8shandler" | ||
| "github.com/openshift/cluster-logging-operator/pkg/utils" | ||
| "github.com/sirupsen/logrus" | ||
| corev1 "k8s.io/api/core/v1" | ||
| apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/controller" | ||
| "sigs.k8s.io/controller-runtime/pkg/event" | ||
| "sigs.k8s.io/controller-runtime/pkg/handler" | ||
| "sigs.k8s.io/controller-runtime/pkg/manager" | ||
| "sigs.k8s.io/controller-runtime/pkg/predicate" | ||
| "sigs.k8s.io/controller-runtime/pkg/reconcile" | ||
| logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" | ||
| "sigs.k8s.io/controller-runtime/pkg/source" | ||
| ) | ||
|
|
||
| var ( | ||
| log = logf.Log.WithName("controller_proxyconfig") | ||
| reconcilePeriod = 30 * time.Second | ||
| reconcileResult = reconcile.Result{RequeueAfter: reconcilePeriod} | ||
| ) | ||
|
|
||
| // Add creates a new ClusterLogging Controller and adds it to the Manager. The Manager will set fields on the Controller | ||
| // and Start it when the Manager is Started. | ||
| func Add(mgr manager.Manager) error { | ||
| return add(mgr, newReconciler(mgr)) | ||
| } | ||
|
|
||
| // newReconciler returns a new reconcile.Reconciler | ||
| func newReconciler(mgr manager.Manager) reconcile.Reconciler { | ||
| if err := configv1.Install(mgr.GetScheme()); err != nil { | ||
| return &ReconcileProxyConfig{} | ||
| } | ||
|
|
||
| return &ReconcileProxyConfig{client: mgr.GetClient(), scheme: mgr.GetScheme()} | ||
| } | ||
|
|
||
| // add adds a new Controller to mgr with r as the reconcile.Reconciler | ||
| func add(mgr manager.Manager, r reconcile.Reconciler) error { | ||
| // Create a new controller | ||
| c, err := controller.New("proxyconfig-controller", mgr, controller.Options{Reconciler: r}) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| // Watch for changes to the additional trust bundle configmap in "openshift-logging". | ||
| pred := predicate.Funcs{ | ||
| UpdateFunc: func(e event.UpdateEvent) bool { return handleConfigMap(e.MetaNew) }, | ||
| DeleteFunc: func(e event.DeleteEvent) bool { return handleConfigMap(e.Meta) }, | ||
| CreateFunc: func(e event.CreateEvent) bool { return handleConfigMap(e.Meta) }, | ||
| GenericFunc: func(e event.GenericEvent) bool { return handleConfigMap(e.Meta) }, | ||
| } | ||
| if err = c.Watch(&source.Kind{Type: &corev1.ConfigMap{}}, &handler.EnqueueRequestForObject{}, pred); err != nil { | ||
ewolinetz marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return err | ||
| } | ||
|
|
||
| // Watch for changes to the proxy resource. | ||
| if err = c.Watch(&source.Kind{Type: &configv1.Proxy{}}, &handler.EnqueueRequestForObject{}); err != nil { | ||
|
||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| var _ reconcile.Reconciler = &ReconcileProxyConfig{} | ||
|
|
||
| // ReconcileProxyConfig reconciles a ClusterLogging object | ||
| type ReconcileProxyConfig struct { | ||
| // This client, initialized using mgr.Client() above, is a split client | ||
| // that reads objects from the cache and writes to the apiserver | ||
| client client.Client | ||
| scheme *runtime.Scheme | ||
| } | ||
|
|
||
| // Reconcile reads that state of the cluster for a cluster-scoped named "cluster" as well as | ||
| // trusted CA bundle configmap objects for the collector and the visualization resources. | ||
| // When the user configured and/or system certs are updated, the change is propagated to the | ||
| // configmap objects and this reconciler triggers to restart those pods. | ||
| func (r *ReconcileProxyConfig) Reconcile(request reconcile.Request) (reconcile.Result, error) { | ||
| loggingNamespacedName := types.NamespacedName{Name: constants.SingletonName, Namespace: constants.OpenshiftNS} | ||
| proxyNamespacedName := types.NamespacedName{Name: constants.ProxyName} | ||
| var proxyConfig *configv1.Proxy = nil | ||
| var trustBundle *corev1.ConfigMap = nil | ||
| if request.NamespacedName == proxyNamespacedName { | ||
| proxyConfig = &configv1.Proxy{} | ||
| if err := r.client.Get(context.TODO(), request.NamespacedName, proxyConfig); err != nil { | ||
| if apierrors.IsNotFound(err) { | ||
| // Request object not found, could have been deleted after reconcile request. | ||
| // Return and don't requeue | ||
| return reconcile.Result{}, nil | ||
| } | ||
| // Error reading the object - just return without requeuing. | ||
| return reconcile.Result{}, err | ||
| } | ||
| } else if utils.ContainsString(constants.ReconcileForGlobalProxyList, request.Name) { | ||
| trustBundle = &corev1.ConfigMap{} | ||
| logrus.Debugf("Trust bundle configmap reconcile request.Namespace/request.Name: '%s/%s'", request.Namespace, request.Name) | ||
| if err := r.client.Get(context.TODO(), loggingNamespacedName, trustBundle); err != nil { | ||
| if !apierrors.IsNotFound(err) { | ||
| // Error reading the object - just return without requeuing. | ||
| return reconcile.Result{}, err | ||
| } | ||
| } | ||
| } else { | ||
| return reconcile.Result{}, nil | ||
| } | ||
|
|
||
| // Fetch the ClusterLogging instance | ||
| instance := &loggingv1.ClusterLogging{} | ||
| if err := r.client.Get(context.TODO(), loggingNamespacedName, instance); err != nil { | ||
| if apierrors.IsNotFound(err) { | ||
| // Request object not found, could have been deleted after reconcile request. | ||
| // Owned objects are automatically garbage collected. For additional cleanup logic use finalizers. | ||
| // Return and don't requeue | ||
| return reconcile.Result{}, nil | ||
| } | ||
| // Error reading the object - just return without requeuing. | ||
| return reconcile.Result{}, err | ||
| } | ||
|
|
||
| if instance.Spec.ManagementState == loggingv1.ManagementStateUnmanaged { | ||
| return reconcile.Result{}, nil | ||
| } | ||
|
|
||
| forwardinginstance := &logforwarding.LogForwarding{} | ||
| err := r.client.Get(context.TODO(), loggingNamespacedName, forwardinginstance) | ||
| if err != nil && !apierrors.IsNotFound(err) { | ||
| // Error reading the object - just return without requeuing. | ||
| return reconcile.Result{}, err | ||
| } | ||
|
|
||
| if err := k8shandler.ReconcileForGlobalProxy(instance, forwardinginstance, proxyConfig, trustBundle, r.client); err != nil { | ||
| // Failed to reconcile - requeuing. | ||
| return reconcileResult, err | ||
| } | ||
|
|
||
| return reconcile.Result{}, nil | ||
| } | ||
|
|
||
| // handleConfigMap returns true if meta namespace is "openshift-logging". | ||
| func handleConfigMap(meta metav1.Object) bool { | ||
| return meta.GetNamespace() == constants.OpenshiftNS && utils.ContainsString(constants.ReconcileForGlobalProxyList, meta.GetName()) | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
else - something has gone very wrong - maybe do an
oc -n ${NAMESPACE} get podsorget deployments? - edit I see below you doget all- then only adddeploymentsif not picked up byallThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jcantrill @JAORMX We can extend this shell function to dump all of the pod logs during the test, rather than figuring out how to do
oc logs,oc exec $pod -- logsetc. in the golang cleanup routine.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let me open another pr for this matter since this debug print is not currently used in this pr. I temporarily enabled it for the debugging legacy e2e in the CI tests.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As in this conversation, improving the debug print will be done in the separate pr.