Skip to content

UI: provide cluster namespace when fetching kubeconfig #1046

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jul 5, 2022
Merged

UI: provide cluster namespace when fetching kubeconfig #1046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui-cra/src/components/Clusters/ClusterDashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const ClusterDashboard = ({ clusterName }: Props) => {
const history = useHistory();

const handleClick = () =>
getKubeconfig(clusterName, `${clusterName}.kubeconfig`);
getKubeconfig(clusterName, currentCluster?.namespace || "", `${clusterName}.kubeconfig`);

const info = [
[
Expand Down
4 changes: 2 additions & 2 deletions ui-cra/src/contexts/Clusters/Provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ const ClustersProvider: FC = ({ children }) => {
);

const getKubeconfig = useCallback(
(clusterName: string, filename: string) => {
request('GET', `/v1/clusters/${clusterName}/kubeconfig`, {
(clusterName: string, clusterNamespace: string, filename: string) => {
request('GET', `/v1/clusters/${clusterName}/kubeconfig?cluster_namespace=${clusterNamespace}`, {
headers: {
Accept: 'application/octet-stream',
},
Expand Down
2 changes: 1 addition & 1 deletion ui-cra/src/contexts/Clusters/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ interface ClustersContext {
data: DeleteClustersPRRequestEnriched,
token: string,
) => Promise<any>;
getKubeconfig: (clusterName: string, fileName: string) => void;
getKubeconfig: (clusterName: string, clusterNamespace: string, fileName: string) => void;
getDashboardAnnotations: (cluster: GitopsClusterEnriched) => {
[key: string]: string;
};
Expand Down