Skip to content

Commit 2ea4142

Browse files
authored
feat: Add fetching nat gateway ips from shoot-info cm (kyma-project#4366)
1 parent ff9d092 commit 2ea4142

File tree

3 files changed

+28
-5
lines changed

3 files changed

+28
-5
lines changed

.github/scripts/install-kyma.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ kubectl apply -f tests/integration/fixtures/community-modules
4747

4848
echo "Apply Kyma provision fixture"
4949
kubectl apply -f tests/integration/fixtures/kyma-info-cm.yaml
50+
kubectl apply -f tests/integration/fixtures/shoot-info-cm.yaml
5051

5152
echo "Apply gardener resources"
5253
echo "Certificates"
Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,26 @@
11
import { useGet } from 'shared/hooks/BackendAPI/useGet';
22

33
export function useGetEnvironmentParameters() {
4-
const { data: environmentParameters, loading: environmentParametersLoading } =
5-
useGet('/api/v1/namespaces/kyma-system/configmaps/kyma-info');
4+
const {
5+
data: environmentParametersFromShootInfoCM,
6+
loading: environmentParametersFromShootInfoCMLoading,
7+
} = useGet('/api/v1/namespaces/kube-system/configmaps/shoot-info');
68

7-
const natGatewayIps =
8-
environmentParameters?.data['cloud.natGatewayIps'].split(', ');
9+
const {
10+
data: environmentParametersFromKymaInfoCM,
11+
loading: environmentParametersFromKymaInfoCMLoading,
12+
} = useGet('/api/v1/namespaces/kyma-system/configmaps/kyma-info');
913

10-
return { natGatewayIps, environmentParametersLoading };
14+
const natGatewayIps = !!environmentParametersFromShootInfoCM
15+
? environmentParametersFromShootInfoCM?.data['egressCIDRs']?.split(',')
16+
: environmentParametersFromKymaInfoCM?.data['cloud.natGatewayIps']?.split(
17+
', ',
18+
);
19+
20+
return {
21+
natGatewayIps,
22+
environmentParametersLoading:
23+
environmentParametersFromShootInfoCMLoading |
24+
environmentParametersFromKymaInfoCMLoading,
25+
};
1126
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
kind: ConfigMap
2+
apiVersion: v1
3+
metadata:
4+
name: shoot-info
5+
namespace: kube-system
6+
data:
7+
egressCIDRs: 3.74.173.24/32,63.177.125.178/32,18.157.247.144/32

0 commit comments

Comments
 (0)