linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Kubernetes health check no longer triggers warning in web UI Top view (#2261) 

Fixes #2255.

When Kubernetes periodically pinged booksapp to perform a health check, the 
lack of namespace violated the `TapLink` component's propTypes requirement.
This triggered a warning in the browser console when on the web UI Top view.
Working with @rmars, I removed the namespace requirement from propTypes and
moved the check for an empty namespace to the top of the component to avoid an
unnecessary queryString construction.
This commit is contained in:
Carol A. Scott 2019-02-12 10:41:29 -08:00 committed by GitHub
parent db747eec8a
commit 0e25c680ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/app/js/components/TapLink.jsx
View File

@ -2,6 +2,9 @@ import PropTypes from 'prop-types';
import React from 'react';
const TapLink = ({PrefixedLink, namespace, resource, toNamespace, toResource, path, disabled}) => {
if (disabled || namespace === "") {
return <i className="fas fa-microscope tapGrayed" />;
}
let params = {
autostart: "true",
namespace,
@ -12,10 +15,6 @@ const TapLink = ({PrefixedLink, namespace, resource, toNamespace, toResource, pa
};
let queryStr = Object.entries(params).map(([k, v]) => `${k}=${v}`).join("&");
if (disabled) {
return <i className="fas fa-microscope tapGrayed" />;
}
return (
<PrefixedLink to={`/tap?${queryStr}`}>
<i className="fas fa-microscope" />
@ -25,7 +24,7 @@ const TapLink = ({PrefixedLink, namespace, resource, toNamespace, toResource, pa
TapLink.propTypes = {
disabled: PropTypes.bool,
namespace: PropTypes.string.isRequired,
namespace: PropTypes.string,
path: PropTypes.string.isRequired,
PrefixedLink: PropTypes.func.isRequired,
resource: PropTypes.string.isRequired,
@ -34,7 +33,8 @@ TapLink.propTypes = {
};
TapLink.defaultProps = {
disabled: false
disabled: false,
namespace: ""
};
export default TapLink;