@spinnaker/core 0.20.1 → 0.21.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +11 -0
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/dist/pipeline/config/stages/bakeManifest/ManifestRenderers.d.ts +3 -1
- package/package.json +2 -2
- package/src/pipeline/config/stages/bakeManifest/BakeManifestStageForm.tsx +4 -4
- package/src/pipeline/config/stages/bakeManifest/ManifestRenderers.ts +5 -0
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
export declare enum ManifestRenderers {
|
|
2
2
|
HELM2 = "HELM2",
|
|
3
3
|
HELM3 = "HELM3",
|
|
4
|
-
KUSTOMIZE = "KUSTOMIZE"
|
|
4
|
+
KUSTOMIZE = "KUSTOMIZE",
|
|
5
|
+
KUSTOMIZE4 = "KUSTOMIZE4"
|
|
5
6
|
}
|
|
6
7
|
export declare const HELM_RENDERERS: Readonly<ManifestRenderers[]>;
|
|
8
|
+
export declare const KUSTOMIZE_RENDERERS: Readonly<ManifestRenderers[]>;
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@spinnaker/core",
|
|
3
3
|
"license": "Apache-2.0",
|
|
4
|
-
"version": "0.
|
|
4
|
+
"version": "0.21.0",
|
|
5
5
|
"module": "dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
7
7
|
"scripts": {
|
|
@@ -120,5 +120,5 @@
|
|
|
120
120
|
"shx": "0.3.3",
|
|
121
121
|
"typescript": "4.3.5"
|
|
122
122
|
},
|
|
123
|
-
"gitHead": "
|
|
123
|
+
"gitHead": "966862b2caf82b5c9879cf418a7c79ec51152dfd"
|
|
124
124
|
}
|
|
@@ -2,7 +2,7 @@ import { isNil } from 'lodash';
|
|
|
2
2
|
import React from 'react';
|
|
3
3
|
|
|
4
4
|
import type { IFormikStageConfigInjectedProps } from '../FormikStageConfig';
|
|
5
|
-
import { HELM_RENDERERS,
|
|
5
|
+
import { HELM_RENDERERS, KUSTOMIZE_RENDERERS } from './ManifestRenderers';
|
|
6
6
|
import { ExpectedArtifactService } from '../../../../artifact';
|
|
7
7
|
import { StageConfigField } from '../common';
|
|
8
8
|
import type { IExpectedArtifact } from '../../../../domain';
|
|
@@ -26,7 +26,7 @@ export function BakeManifestStageForm({ application, formik, pipeline }: IFormik
|
|
|
26
26
|
|
|
27
27
|
// Clear renderer-specific fields when selected renderer changes
|
|
28
28
|
React.useEffect(() => {
|
|
29
|
-
if (stage.templateRenderer
|
|
29
|
+
if (KUSTOMIZE_RENDERERS.includes(stage.templateRenderer) && !isNil(stage.inputArtifacts)) {
|
|
30
30
|
formik.setFieldValue('inputArtifacts', null);
|
|
31
31
|
}
|
|
32
32
|
if (HELM_RENDERERS.includes(stage.templateRenderer) && !isNil(stage.inputArtifact)) {
|
|
@@ -35,7 +35,7 @@ export function BakeManifestStageForm({ application, formik, pipeline }: IFormik
|
|
|
35
35
|
}, [stage.templateRenderer]);
|
|
36
36
|
|
|
37
37
|
const templateRenderers = React.useMemo(() => {
|
|
38
|
-
return [...
|
|
38
|
+
return [...KUSTOMIZE_RENDERERS, ...HELM_RENDERERS];
|
|
39
39
|
}, []);
|
|
40
40
|
|
|
41
41
|
return (
|
|
@@ -56,7 +56,7 @@ export function BakeManifestStageForm({ application, formik, pipeline }: IFormik
|
|
|
56
56
|
stringOptions={templateRenderers}
|
|
57
57
|
/>
|
|
58
58
|
</StageConfigField>
|
|
59
|
-
{stage.templateRenderer
|
|
59
|
+
{KUSTOMIZE_RENDERERS.includes(stage.templateRenderer) && (
|
|
60
60
|
<BakeKustomizeConfigForm pipeline={pipeline} application={application} formik={formik} />
|
|
61
61
|
)}
|
|
62
62
|
{HELM_RENDERERS.includes(stage.templateRenderer) && (
|
|
@@ -2,6 +2,11 @@ export enum ManifestRenderers {
|
|
|
2
2
|
HELM2 = 'HELM2',
|
|
3
3
|
HELM3 = 'HELM3',
|
|
4
4
|
KUSTOMIZE = 'KUSTOMIZE',
|
|
5
|
+
KUSTOMIZE4 = 'KUSTOMIZE4',
|
|
5
6
|
}
|
|
6
7
|
|
|
7
8
|
export const HELM_RENDERERS: Readonly<ManifestRenderers[]> = [ManifestRenderers.HELM2, ManifestRenderers.HELM3];
|
|
9
|
+
export const KUSTOMIZE_RENDERERS: Readonly<ManifestRenderers[]> = [
|
|
10
|
+
ManifestRenderers.KUSTOMIZE,
|
|
11
|
+
ManifestRenderers.KUSTOMIZE4,
|
|
12
|
+
];
|