Skip to content

Commit 27f9d48

Browse files
committed
fix: use ingresses networking.k8s.io/v1
1 parent 1371d3e commit 27f9d48

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

ui/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@fortawesome/free-brands-svg-icons": "^5.7.2",
88
"@fortawesome/free-solid-svg-icons": "^5.7.2",
99
"@fortawesome/react-fontawesome": "^0.1.4",
10-
"@kubernetes/client-node": "0.12.2",
10+
"@kubernetes/client-node": "^0.17.1",
1111
"autoprefixer": "7.1.6",
1212
"babel-jest": "^25.0.0",
1313
"babel-loader": "7.1.2",
@@ -28,7 +28,7 @@
2828
"isomorphic-unfetch": "^3.0.0",
2929
"jest": "^26.0.0",
3030
"js-sha256": "^0.9.0",
31-
"js-yaml": "^3.13.1",
31+
"js-yaml": "^4.1.0",
3232
"moment": "^2.29.4",
3333
"sass": "^1.54.0",
3434
"sass-loader": "10.2.0",
@@ -74,6 +74,7 @@
7474
},
7575
"devDependencies": {
7676
"@types/jest": "^23.3.10",
77+
"@types/js-yaml": "^4.0.5",
7778
"@types/node": "^10.12.12",
7879
"@types/react": "^16.8.2",
7980
"@types/react-dom": "^16.8.0",
@@ -85,7 +86,6 @@
8586
"nodemon": "^1.18.4",
8687
"react-hot-loader": "^4.6.5",
8788
"require-context.macro": "^1.1.0",
88-
"sass-loader": "^8.0.0",
8989
"terser": "^4.8.1",
9090
"terser-webpack-plugin": "^1.4.1",
9191
"typescript": "3.5.3"

ui/src/components/views/Logs/Pod/Pod.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React from 'react';
2-
import { V1Pod, ExtensionsV1beta1IngressList } from '@kubernetes/client-node';
2+
import { V1Pod, V1IngressList } from '@kubernetes/client-node';
33
import styles from './Pod.module.scss';
44
import StatusIconText from 'components/basic/IconText/StatusIconText/StatusIconText';
55
import { GetPodStatus, GetContainerStatus, configToYAML, formatError } from 'lib/utils';
@@ -112,15 +112,15 @@ const openYAMLPopup = (props: Props) => {
112112
const startPortForwarding = async (props: Props) => {
113113
try {
114114
const ingressReponse = await authFetch(
115-
`/api/resource?resource=ingresses&apiVersion=extensions/v1beta1&context=${
115+
`/api/resource?resource=ingresses&apiVersion=networking.k8s.io/v1&context=${
116116
props.devSpaceConfig.kubeContext
117117
}&namespace=${props.devSpaceConfig.kubeNamespace}`
118118
);
119119
if (ingressReponse.status !== 200) {
120120
throw new Error(await ingressReponse.text());
121121
}
122122

123-
const ingressList: ExtensionsV1beta1IngressList = await ingressReponse.json();
123+
const ingressList: V1IngressList = await ingressReponse.json();
124124
const splittedService = props.service.split(':');
125125
if (ingressList && ingressList.items) {
126126
for (let i = 0; i < ingressList.items.length; i++) {
@@ -131,7 +131,7 @@ const startPortForwarding = async (props: Props) => {
131131
if (rule.http && rule.http.paths) {
132132
for (let x = 0; x < rule.http.paths.length; x++) {
133133
const path = rule.http.paths[x];
134-
if (path.backend && path.backend.serviceName === splittedService[0]) {
134+
if (path.backend && path.backend.service && path.backend.service.name === splittedService[0]) {
135135
let suffix = '';
136136
if (path.path) {
137137
suffix = path.path;

ui/src/lib/utils.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ export const GetContainerStatus = (container: V1ContainerStatus) => {
276276
};
277277

278278
export const configToYAML = (config: Config, reverse?: boolean) => {
279-
const yamlString = yaml.safeDump(config, {
279+
const yamlString = yaml.dump(config, {
280280
sortKeys: reverse ? (a, b) => (a < b ? 1 : a > b ? -1 : 0) : false,
281281
});
282282
return yamlString;

0 commit comments

Comments
 (0)