Skip to content

Commit 10542a9

Browse files
seonghoon-jeongseonghoon-jeong
committed
[feat] version up
1 parent 1f1e5dc commit 10542a9

42 files changed

Lines changed: 334 additions & 205 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CHANGELOG.md‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
# v4.1.8 (2020.12.10)
2+
3+
### Features
4+
5+
- 설치 프로그래스 바 갱신 주기 변경
6+
- 기존 일정 시간마다 1% 씩 자동으로 채워지던 기능 제거
7+
- Script 실행 timeout 시간 변경
8+
- 기존 5분에서 10분으로 변경
9+
- 각 제품 설치 단계에서 부가적인 설명 추가
10+
11+
### Fixes
12+
13+
- HyperCloud-Operator 버전 변경 (4.1.1.0 -> 4.1.4.7) (IMS: 247118)
14+
- Rook-Ceph 버전 표기 변경 (ceph버전 -> rook버전) (IMS: 247118)
15+
16+
---
17+
118
# v4.1.7 (2020.12.03)
219

320
### Features

‎app/app.global.css‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,9 @@ svg {
122122
.hidden {
123123
visibility: none !important;
124124
}
125+
126+
/* tooltip */
127+
/* default padding 제거 */
128+
.MuiButtonBase-root.MuiIconButton-root {
129+
padding: 0px;
130+
}

‎app/components/install/InstallContents1.css‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55

66
.contents {
77
text-align: center;
8+
min-width: 300px;
89
}
910
.contents > div {
1011
margin-bottom: 20px;

‎app/components/install/Tekton/InstallContentsTekton1.tsx‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,13 @@ function InstallContentsTekton1(props: any) {
5353
</MuiBox>
5454
</div>
5555
<div>
56-
<span className={['medium', 'lightDark'].join(' ')}>{CONST.PRODUCT.TEKTON.NAME} 를 설치할 수 있습니다.</span>
56+
<span className={['medium', 'lightDark'].join(' ')}>
57+
{CONST.PRODUCT.TEKTON.NAME} 를 설치할 수 있습니다.
58+
</span>
5759
<br />
58-
<span className={['medium', 'lightDark'].join(' ')}>계속하시려면, 아래의 버튼을 클릭해 주세요.</span>
60+
<span className={['medium', 'lightDark'].join(' ')}>
61+
계속하시려면, 아래의 버튼을 클릭해 주세요.
62+
</span>
5963
</div>
6064
<div>
6165
<Button
@@ -71,6 +75,12 @@ function InstallContentsTekton1(props: any) {
7175
다음 >
7276
</Button>
7377
</div>
78+
{/* <div>
79+
<span className={['verySmall', 'indicator'].join(' ')}>
80+
이전 단계 제품을 설치하지 않았을 경우, 해당 제품 설치는 가능하나,
81+
정상동작은 보장하지 않습니다.
82+
</span>
83+
</div> */}
7484
</div>
7585
</div>
7686
</div>

‎app/components/install/Tekton/InstallContentsTekton3.tsx‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@ function InstallContentsTekton3(props: any) {
3232

3333
// progress bar
3434
const [progress, setProgress] = React.useState(0);
35-
React.useEffect(() => {
36-
const timer = setInterval(() => {
37-
setProgress(prevProgress =>
38-
prevProgress >= 100 ? 100 : prevProgress + 1
39-
);
40-
}, 5000);
41-
return () => {
42-
clearInterval(timer);
43-
};
44-
}, []);
4535

4636
if (progress === 100) {
4737
nowEnv.deleteProductByName(CONST.PRODUCT.TEKTON.NAME);
@@ -86,7 +76,8 @@ function InstallContentsTekton3(props: any) {
8676
const tektonTriggerInstaller = TektonTriggerInstaller.getInstance;
8777
const tektonApprovalInstaller = TektonApprovalInstaller.getInstance;
8878
const tektonMailNotifierInstaller = TektonMailNotifierInstaller.getInstance;
89-
const tektonCiCdTemplatesInstaller = TektonCiCdTemplatesInstaller.getInstance;
79+
const tektonCiCdTemplatesInstaller =
80+
TektonCiCdTemplatesInstaller.getInstance;
9081

9182
tektonPipelineInstaller.env = nowEnv;
9283
tektonTriggerInstaller.env = nowEnv;
@@ -144,8 +135,14 @@ function InstallContentsTekton3(props: any) {
144135

145136
React.useEffect(() => {
146137
install();
147-
148-
return () => {};
138+
// const timer = setInterval(() => {
139+
// setProgress(prevProgress =>
140+
// prevProgress >= 100 ? 100 : prevProgress + 1
141+
// );
142+
// }, 5000);
143+
// return () => {
144+
// clearInterval(timer);
145+
// };
149146
}, []);
150147

151148
return (

‎app/components/install/catalogController/InstallContentsCatalogController3.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,14 @@ function InstallContentsCatalogController3(props: any) {
8383

8484
React.useEffect(() => {
8585
install();
86-
const timer = setInterval(() => {
87-
setProgress(prevProgress =>
88-
prevProgress >= 100 ? 100 : prevProgress + 1
89-
);
90-
}, 5000);
91-
return () => {
92-
clearInterval(timer);
93-
};
86+
// const timer = setInterval(() => {
87+
// setProgress(prevProgress =>
88+
// prevProgress >= 100 ? 100 : prevProgress + 1
89+
// );
90+
// }, 5000);
91+
// return () => {
92+
// clearInterval(timer);
93+
// };
9494
}, []);
9595

9696
return (

‎app/components/install/cni/InstallContentsCni3.tsx‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@ function InstallContentsCni3(props: any) {
2828

2929
// progress bar
3030
const [progress, setProgress] = React.useState(0);
31-
React.useEffect(() => {
32-
const timer = setInterval(() => {
33-
setProgress(prevProgress =>
34-
prevProgress >= 100 ? 100 : prevProgress + 1
35-
);
36-
}, 3000);
37-
return () => {
38-
clearInterval(timer);
39-
};
40-
}, []);
4131

4232
if (progress === 100) {
4333
nowEnv.deleteProductByName(CONST.PRODUCT.CNI.NAME);
@@ -96,8 +86,14 @@ function InstallContentsCni3(props: any) {
9686

9787
React.useEffect(() => {
9888
install();
99-
100-
return () => {};
89+
// const timer = setInterval(() => {
90+
// setProgress(prevProgress =>
91+
// prevProgress >= 100 ? 100 : prevProgress + 1
92+
// );
93+
// }, 3000);
94+
// return () => {
95+
// clearInterval(timer);
96+
// };
10197
}, []);
10298

10399
return (

‎app/components/install/hyperAuth/InstallContentsHyperAuth3.tsx‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,6 @@ function InstallContentsHyperAuth3(props: any) {
2828

2929
// progress bar
3030
const [progress, setProgress] = React.useState(0);
31-
React.useEffect(() => {
32-
const timer = setInterval(() => {
33-
setProgress(prevProgress =>
34-
prevProgress >= 100 ? 100 : prevProgress + 1
35-
);
36-
}, 6000);
37-
return () => {
38-
clearInterval(timer);
39-
};
40-
}, []);
4131

4232
if (progress === 100) {
4333
nowEnv.deleteProductByName(CONST.PRODUCT.HYPERAUTH.NAME);
@@ -93,8 +83,14 @@ function InstallContentsHyperAuth3(props: any) {
9383

9484
React.useEffect(() => {
9585
install();
96-
97-
return () => {};
86+
// const timer = setInterval(() => {
87+
// setProgress(prevProgress =>
88+
// prevProgress >= 100 ? 100 : prevProgress + 1
89+
// );
90+
// }, 6000);
91+
// return () => {
92+
// clearInterval(timer);
93+
// };
9894
}, []);
9995

10096
return (

‎app/components/install/hyperCloud/InstallContentsHyperCloud1.tsx‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,13 @@ function InstallContentsHyperCloud1(props: any) {
5353
</MuiBox>
5454
</div>
5555
<div>
56-
<span className={['medium', 'lightDark'].join(' ')}>{CONST.PRODUCT.HYPERCLOUD.NAME} 를 설치할 수 있습니다.</span>
56+
<span className={['medium', 'lightDark'].join(' ')}>
57+
{CONST.PRODUCT.HYPERCLOUD.NAME} 를 설치할 수 있습니다.
58+
</span>
5759
<br />
58-
<span className={['medium', 'lightDark'].join(' ')}>계속하시려면, 아래의 버튼을 클릭해 주세요.</span>
60+
<span className={['medium', 'lightDark'].join(' ')}>
61+
계속하시려면, 아래의 버튼을 클릭해 주세요.
62+
</span>
5963
</div>
6064
<div>
6165
<Button
@@ -74,6 +78,17 @@ function InstallContentsHyperCloud1(props: any) {
7478
다음 >
7579
</Button>
7680
</div>
81+
<div>
82+
<ul className={['small', 'indicator'].join(' ')}>
83+
<li>
84+
정상적인 설치를 위해선, HyperAuth가 설치 되어있어야 합니다.
85+
</li>
86+
<li>
87+
또한, HyperAuth의 POD들의 Status가 Running이어야 하고, 모두
88+
Ready 상태이어야 합니다.
89+
</li>
90+
</ul>
91+
</div>
7792
</div>
7893
</div>
7994
</div>

‎app/components/install/hyperCloud/InstallContentsHyperCloud3.tsx‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,6 @@ function InstallContentsHyperCloud3(props: any) {
3232

3333
// progress bar
3434
const [progress, setProgress] = React.useState(0);
35-
React.useEffect(() => {
36-
const timer = setInterval(() => {
37-
setProgress(prevProgress =>
38-
prevProgress >= 100 ? 100 : prevProgress + 1
39-
);
40-
}, 5000);
41-
return () => {
42-
clearInterval(timer);
43-
};
44-
}, []);
4535

4636
if (progress === 100) {
4737
nowEnv.deleteProductByName(CONST.PRODUCT.HYPERCLOUD.NAME);
@@ -156,8 +146,14 @@ function InstallContentsHyperCloud3(props: any) {
156146

157147
React.useEffect(() => {
158148
install();
159-
160-
return () => {};
149+
// const timer = setInterval(() => {
150+
// setProgress(prevProgress =>
151+
// prevProgress >= 100 ? 100 : prevProgress + 1
152+
// );
153+
// }, 5000);
154+
// return () => {
155+
// clearInterval(timer);
156+
// };
161157
}, []);
162158

163159
return (

0 commit comments

Comments
 (0)