Skip to content

Commit 9cb6da3

Browse files
Yangyang96Yangyang96
committed
chore: update kusion chart
1 parent 30d37fe commit 9cb6da3

File tree

6 files changed

+46
-71
lines changed

6 files changed

+46
-71
lines changed

Diff for: ‎charts/kusion/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: kusion
3-
version: 0.14.1
3+
version: 0.14.2
44
type: application
55
appVersion: 0.14.0
66
description: Kusion - An Intent-Driven Platform Orchestrator

Diff for: ‎charts/kusion/README.md

+16-10
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Kusion Chart
22

3-
![Version: 0.14.0](https://img.shields.io/badge/Version-0.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square) [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/kusion)](https://artifacthub.io/packages/helm/kusionstack/kusion)
3+
![Version: 0.14.2](https://img.shields.io/badge/Version-0.14.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.14.0](https://img.shields.io/badge/AppVersion-0.14.0-informational?style=flat-square) [![Artifact HUB](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/kusion)](https://artifacthub.io/packages/helm/kusionstack/kusion)
44

55
Kusion - An Intent-Driven Platform Orchestrator
66

@@ -22,7 +22,13 @@ Kusion - An Intent-Driven Platform Orchestrator
2222

2323
## Installing the Chart
2424

25-
> Note: A valid kubeconfig configuration is required for Kusion to function properly. You must either use the installation script, provide your own kubeconfig in values.yaml, or set it through the --set parameter
25+
> **Important:** Kusion requires a valid kubeconfig configuration to function properly. You can provide it via:
26+
> - Installation script (recommended)
27+
> - Custom values.yaml file
28+
> - Helm --set parameter
29+
30+
> **Note:** Default kubeconfig path is `/var/run/secrets/kubernetes.io/kubeconfigs/`
31+
> To use a different path, set `kubeconfig.kubeConfigVolumeMountPath` to your desired path.
2632
2733
To install Kusion, you have the following options:
2834

@@ -46,9 +52,9 @@ Edit the [values file](values.yaml) to add your kubeconfig content
4652
# Replace the content below with your actual kubeconfig
4753
kubeconfig:
4854
kubeConfigs:
49-
kubeconfig0: |
55+
kubeconfig-0: |
5056
Please fill in your KubeConfig contents here.
51-
kubeconfig1: |
57+
kubeconfig-1: |
5258
Please fill in your KubeConfig contents here.
5359
```
5460
@@ -63,16 +69,16 @@ helm install kusion-release ./kusion
6369
First, you need to base64 encode your kubeconfig files.
6470

6571
```shell
66-
KUBECONFIG_CONTENT1=$(base64 -w 0 /path/to/your/kubeconfig1)
67-
KUBECONFIG_CONTENT2=$(base64 -w 0 /path/to/your/kubeconfig2)
72+
KUBECONFIG_CONTENT1=$(cat /path/to/your/kubeconfig-1 | base64 | tr -d '\n')
73+
KUBECONFIG_CONTENT2=$(cat /path/to/your/kubeconfig-2 | base64 | tr -d '\n')
6874
```
6975

7076
Then you can use the following command to install the latest version of Kusion.
7177

7278
```shell
7379
helm install kusion-release kusionstack/kusion \
74-
--set kubeconfig.kubeConfigs.kubeconfig0="$KUBECONFIG_CONTENT1" \
75-
--set kubeconfig.kubeConfigs.kubeconfig1="$KUBECONFIG_CONTENT2"
80+
--set kubeconfig.kubeConfigs.kubeconfig-0="$KUBECONFIG_CONTENT1" \
81+
--set kubeconfig.kubeConfigs.kubeconfig-1="$KUBECONFIG_CONTENT2"
7682
```
7783

7884
You may also have to set your specific configurations if it is deployed into a production cluster, or you want to customize the chart configuration, such as `port`, `replicas`, `database` etc.
@@ -85,8 +91,8 @@ helm install kusion-release kusionstack/kusion \
8591
--set server.replicas=3 \
8692
--set mysql.enabled=true \
8793
--set mysql.database=kusion \
88-
--set kubeconfig.kubeConfigs.kubeconfig0="$KUBECONFIG_CONTENT1" \
89-
--set kubeconfig.kubeConfigs.kubeconfig1="$KUBECONFIG_CONTENT2"
94+
--set kubeconfig.kubeConfigs.kubeconfig-0="$KUBECONFIG_CONTENT1" \
95+
--set kubeconfig.kubeConfigs.kubeconfig-1="$KUBECONFIG_CONTENT2"
9096
```
9197

9298
## Chart Parameters

Diff for: ‎charts/kusion/README.md.gotmpl

+15-9
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,13 @@
1616

1717
## Installing the Chart
1818

19-
> Note: A valid kubeconfig configuration is required for Kusion to function properly. You must either use the installation script, provide your own kubeconfig in values.yaml, or set it through the --set parameter
19+
> **Important:** Kusion requires a valid kubeconfig configuration to function properly. You can provide it via:
20+
> - Installation script (recommended)
21+
> - Custom values.yaml file
22+
> - Helm --set parameter
23+
24+
> **Note:** Default kubeconfig path is `/var/run/secrets/kubernetes.io/kubeconfigs/`
25+
> To use a different path, set `kubeconfig.kubeConfigVolumeMountPath` to your desired path.
2026

2127
To install Kusion, you have the following options:
2228

@@ -40,9 +46,9 @@ Edit the [values file](values.yaml) to add your kubeconfig content
4046
# Replace the content below with your actual kubeconfig
4147
kubeconfig:
4248
kubeConfigs:
43-
kubeconfig0: |
49+
kubeconfig-0: |
4450
Please fill in your KubeConfig contents here.
45-
kubeconfig1: |
51+
kubeconfig-1: |
4652
Please fill in your KubeConfig contents here.
4753
```
4854

@@ -57,16 +63,16 @@ helm install kusion-release ./kusion
5763
First, you need to base64 encode your kubeconfig files.
5864

5965
```shell
60-
KUBECONFIG_CONTENT1=$(base64 -w 0 /path/to/your/kubeconfig1)
61-
KUBECONFIG_CONTENT2=$(base64 -w 0 /path/to/your/kubeconfig2)
66+
KUBECONFIG_CONTENT1=$(cat /path/to/your/kubeconfig-1 | base64 | tr -d '\n')
67+
KUBECONFIG_CONTENT2=$(cat /path/to/your/kubeconfig-2 | base64 | tr -d '\n')
6268
```
6369

6470
Then you can use the following command to install the latest version of Kusion.
6571

6672
```shell
6773
helm install kusion-release kusionstack/kusion \
68-
--set kubeconfig.kubeConfigs.kubeconfig0="$KUBECONFIG_CONTENT1" \
69-
--set kubeconfig.kubeConfigs.kubeconfig1="$KUBECONFIG_CONTENT2"
74+
--set kubeconfig.kubeConfigs.kubeconfig-0="$KUBECONFIG_CONTENT1" \
75+
--set kubeconfig.kubeConfigs.kubeconfig-1="$KUBECONFIG_CONTENT2"
7076
```
7177

7278
You may also have to set your specific configurations if it is deployed into a production cluster, or you want to customize the chart configuration, such as `port`, `replicas`, `database` etc.
@@ -79,8 +85,8 @@ helm install kusion-release kusionstack/kusion \
7985
--set server.replicas=3 \
8086
--set mysql.enabled=true \
8187
--set mysql.database=kusion \
82-
--set kubeconfig.kubeConfigs.kubeconfig0="$KUBECONFIG_CONTENT1" \
83-
--set kubeconfig.kubeConfigs.kubeconfig1="$KUBECONFIG_CONTENT2"
88+
--set kubeconfig.kubeConfigs.kubeconfig-0="$KUBECONFIG_CONTENT1" \
89+
--set kubeconfig.kubeConfigs.kubeconfig-1="$KUBECONFIG_CONTENT2"
8490
```
8591

8692
## Chart Parameters

Diff for: ‎charts/kusion/templates/post-run-job.yaml

+11-48
Original file line numberDiff line numberDiff line change
@@ -30,57 +30,20 @@ spec:
3030
command:
3131
- /bin/sh
3232
- -c
33-
- >
34-
echo "Calling Kusion API for Module Registration...";
33+
- |
34+
echo "Calling Kusion API for Module Registration..."
3535
36-
echo "Registering kam module...";
37-
curl -X POST "${KUSION_SERVER_ENDPOINT}/api/v1/modules" \
36+
echo "Registering kam module..."
37+
curl -X POST "http://${KUSION_SERVER_ENDPOINT}/api/v1/modules" \
3838
-H "Content-Type: application/json" \
39-
-d '{"name":"kam","url":"oci://ghcr.io/kusionstack/kam"}';
39+
-d '{"name":"kam","url":"oci://ghcr.io/kusionstack/kam","description":"The kam module represents a Kusion opinionated abstraction of the core concepts during application delivery.","doc":"https://www.kusionstack.io/docs/reference/modules/developer-schemas/app-configuration"}'
4040
41-
curl -X PUT "${KUSION_SERVER_ENDPOINT}/api/v1/modules/kam" \
41+
echo "Registering service module..."
42+
curl -X POST "http://${KUSION_SERVER_ENDPOINT}/api/v1/modules" \
4243
-H "Content-Type: application/json" \
43-
-d '{"name":"kam","description":"The kam module represents a Kusion opinionated abstraction of the core concepts during application delivery."}';
44+
-d '{"name":"service","url":"oci://ghcr.io/kusionstack/service","description":"The service module represents a kind of workload profile that describes how to run your application code.","doc":"https://www.kusionstack.io/docs/reference/modules/developer-schemas/workload/service"}'
4445
45-
curl -X PUT "${KUSION_SERVER_ENDPOINT}/api/v1/modules/kam" \
46+
echo "Registering network module..."
47+
curl -X POST "http://${KUSION_SERVER_ENDPOINT}/api/v1/modules" \
4648
-H "Content-Type: application/json" \
47-
-d '{"name":"kam","doc":"https://www.kusionstack.io/docs/reference/modules/developer-schemas/app-configuration"}';
48-
49-
curl -X PUT "${KUSION_SERVER_ENDPOINT}/api/v1/modules/kam" \
50-
-H "Content-Type: application/json" \
51-
-d '{"name":"kam","url":"git://github.com/KusionStack/kam"}';
52-
53-
echo "Registering service module...";
54-
curl -X POST "${KUSION_SERVER_ENDPOINT}/api/v1/modules" \
55-
-H "Content-Type: application/json" \
56-
-d '{"name":"service","url":"oci://ghcr.io/kusionstack/service"}';
57-
58-
curl -X PUT "${KUSION_SERVER_ENDPOINT}/api/v1/modules/service" \
59-
-H "Content-Type: application/json" \
60-
-d '{"name":"service","description":"The service module represents a kind of workload profile that describes how to run your application code."}';
61-
62-
curl -X PUT "${KUSION_SERVER_ENDPOINT}/api/v1/modules/service" \
63-
-H "Content-Type: application/json" \
64-
-d '{"name":"service","doc":"https://www.kusionstack.io/docs/reference/modules/developer-schemas/workload/service"}';
65-
66-
curl -X PUT "${KUSION_SERVER_ENDPOINT}/api/v1/modules/service" \
67-
-H "Content-Type: application/json" \
68-
-d '{"name":"service","url":"oci://ghcr.io/kusionstack/service"}';
69-
70-
echo "Registering network module...";
71-
curl -X POST "${KUSION_SERVER_ENDPOINT}/api/v1/modules" \
72-
-H "Content-Type: application/json" \
73-
-d '{"name":"network","url":"oci://ghcr.io/kusionstack/network"}';
74-
75-
curl -X PUT "${KUSION_SERVER_ENDPOINT}/api/v1/modules/network" \
76-
-H "Content-Type: application/json" \
77-
-d '{"name":"network","description":"The network module represents a network accessory of workload, typically containing exposed ports and a load balancer."}';
78-
79-
curl -X PUT "${KUSION_SERVER_ENDPOINT}/api/v1/modules/network" \
80-
-H "Content-Type: application/json" \
81-
-d '{"name":"network","doc":"https://www.kusionstack.io/docs/reference/modules/developer-schemas/network"}';
82-
83-
curl -X PUT "${KUSION_SERVER_ENDPOINT}/api/v1/modules/network" \
84-
-H "Content-Type: application/json" \
85-
-d '{"name":"network","url":"oci://ghcr.io/kusionstack/network"}';
86-
backoffLimit: 10
49+
-d '{"name":"network","url":"oci://ghcr.io/kusionstack/network","description":"The network module represents a network accessory of workload, typically containing exposed ports and a load balancer.","doc":"https://www.kusionstack.io/docs/reference/modules/developer-schemas/network"}'

Diff for: ‎charts/kusion/values.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ kubeconfig:
122122
kubeConfigs: {}
123123
# Example structure:
124124
# kubeConfigs:
125-
# kubeconfig0: |
125+
# kubeconfig-0: |
126126
# Please fill in your KubeConfig contents here.
127-
# kubeconfig1: |
127+
# kubeconfig-1: |
128128
# Please fill in your KubeConfig contents here.

Diff for: ‎scripts/install-kusion.sh

100644100755
+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ for arg in "$@"; do
2222
fi
2323

2424
# base64 encode
25-
content=$(base64 -w 0 "$path")
25+
content=$(cat "$path" | base64 | tr -d '\n')
2626

2727
# Build helm --set argument
2828
KUBECONFIG_ARGS="${KUBECONFIG_ARGS} --set kubeconfig.kubeConfigs.${key}=${content}"

0 commit comments

Comments
 (0)