Skip to content

Commit 03a795a

Browse files
jordiclarianajordiclariana
authored
Merge pull request #11 from jordiclariana/update-main-ankorstore
Update main ankorstore
2 parents 7621b44 + 4546afc commit 03a795a

25 files changed

+307
-72
lines changed

‎devspace-schema.json

Lines changed: 78 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,10 @@
359359
"$ref": "#/$defs/KubectlConfig",
360360
"description": "Kubectl tells DevSpace to deploy this deployment via kubectl or kustomize"
361361
},
362+
"tanka": {
363+
"$ref": "#/$defs/TankaConfig",
364+
"description": "Tanka tells DevSpace to deployment via Tanka"
365+
},
362366
"updateImageTags": {
363367
"type": "boolean",
364368
"description": "UpdateImageTags lets you define if DevSpace should update the tags of the images defined in the\nimages section with their most recent built tag."
@@ -1848,6 +1852,79 @@
18481852
"type": "object",
18491853
"description": "SyncOnUpload defines the struct for the command that should be executed when files / folders are uploaded"
18501854
},
1855+
"TankaConfig": {
1856+
"properties": {
1857+
"path": {
1858+
"type": "string",
1859+
"description": "Path is the (relative) path of the tanka environment, usually identified by jsonnetfile.json.\nIt can be omitted if environmentPath is set and is also relative to the working directory (Tanka's project directory tree). If omitted, Devspace will traverse in reverse environmentPath looking for jsonnetfile.json, when found, that will be set as Path. Otherwise will throw an error."
1860+
},
1861+
"runJsonnetBundlerInstall": {
1862+
"type": "boolean",
1863+
"description": "RunJsonnetBundlerInstall indicates if the `jb install` command shall be run, default to true"
1864+
},
1865+
"runJsonnetBundlerUpdate": {
1866+
"type": "boolean",
1867+
"description": "RunJsonnetBundlerUpdate indicates if the `jb update` command shall be run default to false"
1868+
},
1869+
"environmentPath": {
1870+
"type": "string",
1871+
"description": "EnvironmentPath is the (relative) path to a specific tanka environment.\nIn case Path is omitted it will be used to discover Tanka project's root. Look at Path parameter for more details."
1872+
},
1873+
"environmentName": {
1874+
"type": "string",
1875+
"description": "When using environment auto-discovery, this maps to the `--name` parameter"
1876+
},
1877+
"externalCodeVariables": {
1878+
"patternProperties": {
1879+
".*": {
1880+
"type": "string"
1881+
}
1882+
},
1883+
"type": "object",
1884+
"description": "Maps to --ext-code cli argument."
1885+
},
1886+
"externalStringVariables": {
1887+
"patternProperties": {
1888+
".*": {
1889+
"type": "string"
1890+
}
1891+
},
1892+
"type": "object",
1893+
"description": "Maps to --ext-str cli argument."
1894+
},
1895+
"topLevelCode": {
1896+
"items": {
1897+
"type": "string"
1898+
},
1899+
"type": "array",
1900+
"description": "Maps to --tla-code argument."
1901+
},
1902+
"topLevelString": {
1903+
"items": {
1904+
"type": "string"
1905+
},
1906+
"type": "array",
1907+
"description": "Maps to --tla-string argument."
1908+
},
1909+
"targets": {
1910+
"items": {
1911+
"type": "string"
1912+
},
1913+
"type": "array",
1914+
"description": "Maps to the option `--target` argument and allows filtering for specific resources."
1915+
},
1916+
"jsonnetBundlerBinaryPath": {
1917+
"type": "string",
1918+
"description": "JsonBundlerBinaryPath allows overriding the `jb` binary used."
1919+
},
1920+
"tankaBinaryPath": {
1921+
"type": "string",
1922+
"description": "JsonBundlerBinaryPath allows overriding the `tanka` binary used."
1923+
}
1924+
},
1925+
"type": "object",
1926+
"description": "TankaConfig defines the specific tanka options used during deployment."
1927+
},
18511928
"Target": {
18521929
"properties": {
18531930
"apiVersion": {
@@ -2221,4 +2298,4 @@
22212298
"name"
22222299
],
22232300
"description": "Config defines the configuration"
2224-
}
2301+
}

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka.mdx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11

2-
import PartialTankaReference from "./tanka_reference.mdx"
2+
import PartialTankareference from "./tanka_reference.mdx"
33

44

55
<details className="config-field" data-expandable="true" open>
66
<summary>
77

88
### `tanka` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type"></span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka}
99

10-
Tanka tells DevSpace to deploy this deployment via tanka
10+
Tanka tells DevSpace to deployment via Tanka
1111

1212
</summary>
1313

14-
<PartialTankaReference />
14+
<PartialTankareference />
1515

1616

1717
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/envname.mdx renamed to ‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/environmentName.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
#### `environmentName` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-environmentName}
66

7-
When using environment auto-discovery, this maps to the `--name` parameter.
7+
When using environment auto-discovery, this maps to the `--name` parameter
88

99
</summary>
1010

1111

12+
1213
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/envpath.mdx renamed to ‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/environmentPath.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
#### `environmentPath` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-environmentPath}
66

77
EnvironmentPath is the (relative) path to a specific tanka environment.
8+
In case Path is omitted it will be used to discover Tanka project's root. Look at Path parameter for more details.
89

910
</summary>
1011

1112

13+
1214
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/externalcodevariables.mdx renamed to ‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/externalCodeVariables.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<details className="config-field" data-expandable="false" open>
33
<summary>
44

5-
#### `externalCodeVariables` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">object</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-externalCodeVariables}
5+
#### `externalCodeVariables` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">&lt;externalCodeVariable_name&gt;:string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-externalCodeVariables}
66

77
Maps to --ext-code cli argument.
88

99
</summary>
1010

1111

12+
1213
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/externalStringVariables.mdx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
<details className="config-field" data-expandable="false" open>
3+
<summary>
4+
5+
#### `externalStringVariables` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">&lt;externalStringVariable_name&gt;:string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-externalStringVariables}
6+
7+
Maps to --ext-str cli argument.
8+
9+
</summary>
10+
11+
12+
13+
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/externalstringvariables.mdx

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/jsonnetBundlerBinaryPath.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
#### `jsonnetBundlerBinaryPath` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-jsonnetBundlerBinaryPath}
66

7-
jsonnetBundlerBinaryPath is the optional path where to find the Jsonnet Bundler binary
7+
JsonBundlerBinaryPath allows overriding the `jb` binary used.
88

99
</summary>
1010

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/path.mdx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@
55
#### `path` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-path}
66

77
Path is the (relative) path of the tanka environment, usually identified by jsonnetfile.json.
8+
It can be omitted if environmentPath is set and is also relative to the working directory (Tanka's project directory tree). If omitted, Devspace will traverse in reverse environmentPath looking for jsonnetfile.json, when found, that will be set as Path. Otherwise will throw an error.
89

910
</summary>
1011

1112

13+
1214
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/bundlerinstall.mdx renamed to ‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/runJsonnetBundlerInstall.mdx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<details className="config-field" data-expandable="false" open>
33
<summary>
44

5-
#### `runJsonnetBundlerInstall` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">boolean</span> <span className="config-field-default">true</span> {#deployments-kubectl-runJsonnetBundlerInstall}
5+
#### `runJsonnetBundlerInstall` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">boolean</span> <span className="config-field-default">false</span> <span className="config-field-enum"></span> {#deployments-tanka-runJsonnetBundlerInstall}
66

7-
RunJsonnetBundlerInstall indicates if the `jb install` command shall be run before using tanka
7+
RunJsonnetBundlerInstall indicates if the `jb install` command shall be run, default to true
88

99
</summary>
1010

1111

12+
1213
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/bundlerupdate.mdx renamed to ‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/runJsonnetBundlerUpdate.mdx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<details className="config-field" data-expandable="false" open>
33
<summary>
44

5-
#### `runJsonnetBundlerUpdate` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">boolean</span> <span className="config-field-default">true</span> {#deployments-kubectl-runJsonnetBundlerUpdate}
5+
#### `runJsonnetBundlerUpdate` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">boolean</span> <span className="config-field-default">false</span> <span className="config-field-enum"></span> {#deployments-tanka-runJsonnetBundlerUpdate}
66

7-
RunJsonnetBundlerUpdate indicates if the `jb update` command shall be run before using tanka
7+
RunJsonnetBundlerUpdate indicates if the `jb update` command shall be run default to false
88

99
</summary>
1010

1111

12+
1213
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/tankaBinaryPath.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
#### `tankaBinaryPath` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-tankaBinaryPath}
66

7-
tankaBinaryPath is the optional path where to find the Tanka binary
7+
JsonBundlerBinaryPath allows overriding the `tanka` binary used.
88

99
</summary>
1010

1111

12+
1213
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/target.mdx

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/targets.mdx

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
2+
<details className="config-field" data-expandable="false" open>
3+
<summary>
4+
5+
#### `targets` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string[]</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-targets}
6+
7+
Maps to the option `--target` argument and allows filtering for specific resources.
8+
9+
</summary>
10+
11+
12+
13+
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/toplevelcode.mdx renamed to ‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/topLevelCode.mdx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<details className="config-field" data-expandable="false" open>
33
<summary>
44

5-
#### `topLevelCode` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">[]string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-topLevelCode}
5+
#### `topLevelCode` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string[]</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-topLevelCode}
66

77
Maps to --tla-code argument.
88

99
</summary>
1010

1111

12+
1213
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/toplevelstring.mdx renamed to ‎docs/pages/configuration/_partials/v2beta1/deployments/tanka/topLevelString.mdx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1+
12
<details className="config-field" data-expandable="false" open>
23
<summary>
34

4-
#### `topLevelString` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">[]string</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-topLevelString}
5+
#### `topLevelString` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type">string[]</span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka-topLevelString}
56

67
Maps to --tla-string argument.
78

89
</summary>
910

1011

12+
1113
</details>

‎docs/pages/configuration/_partials/v2beta1/deployments/tanka_reference.mdx

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,48 @@
1+
12
import PartialPath from "./tanka/path.mdx"
2-
import PartialRunJsonnetBundlerInstall from "./tanka/bundlerinstall.mdx"
3-
import PartialRunJsonnetBundlerUpdate from "./tanka/bundlerupdate.mdx"
4-
import PartialEnvironmentPath from "./tanka/envpath.mdx"
5-
import PartialEnvironmentName from "./tanka/envname.mdx"
6-
import PartialExternalCodeVariables from "./tanka/externalcodevariables.mdx"
7-
import PartialExternalStringVariables from "./tanka/externalstringvariables.mdx"
8-
import PartialTopLevelCode from "./tanka/toplevelcode.mdx"
9-
import PartialTopLevelString from "./tanka/toplevelstring.mdx"
10-
import PartialTarget from "./tanka/target.mdx"
3+
import PartialRunJsonnetBundlerInstall from "./tanka/runJsonnetBundlerInstall.mdx"
4+
import PartialRunJsonnetBundlerUpdate from "./tanka/runJsonnetBundlerUpdate.mdx"
5+
import PartialEnvironmentPath from "./tanka/environmentPath.mdx"
6+
import PartialEnvironmentName from "./tanka/environmentName.mdx"
7+
import PartialExternalCodeVariables from "./tanka/externalCodeVariables.mdx"
8+
import PartialExternalStringVariables from "./tanka/externalStringVariables.mdx"
9+
import PartialTopLevelCode from "./tanka/topLevelCode.mdx"
10+
import PartialTopLevelString from "./tanka/topLevelString.mdx"
11+
import PartialTargets from "./tanka/targets.mdx"
1112
import PartialJsonnetBundlerBinaryPath from "./tanka/jsonnetBundlerBinaryPath.mdx"
1213
import PartialTankaBinaryPath from "./tanka/tankaBinaryPath.mdx"
1314

1415
<PartialPath />
1516

16-
<PartialRunJsonnetBundlerInstall />
17+
18+
<PartialRunJsonnetBundlerInstall />
19+
1720

1821
<PartialRunJsonnetBundlerUpdate />
1922

23+
2024
<PartialEnvironmentPath />
2125

26+
2227
<PartialEnvironmentName />
2328

29+
2430
<PartialExternalCodeVariables />
2531

32+
2633
<PartialExternalStringVariables />
2734

35+
2836
<PartialTopLevelCode />
2937

38+
3039
<PartialTopLevelString />
3140

32-
<PartialTarget />
41+
42+
<PartialTargets />
43+
3344

3445
<PartialJsonnetBundlerBinaryPath />
3546

36-
<PartialTankaBinaryPath />
47+
48+
<PartialTankaBinaryPath />

‎docs/pages/configuration/_partials/v2beta1/deployments_reference.mdx

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11

22
import PartialHelmreference from "./deployments/helm_reference.mdx"
33
import PartialKubectlreference from "./deployments/kubectl_reference.mdx"
4+
import PartialTankareference from "./deployments/tanka_reference.mdx"
45
import PartialUpdateImageTags from "./deployments/updateImageTags.mdx"
56
import PartialNamespace from "./deployments/namespace.mdx"
6-
import PartialTankareference from "./deployments/tanka_reference.mdx"
7+
78

89
<details className="config-field" data-expandable="true">
910
<summary>
@@ -35,12 +36,14 @@ Kubectl tells DevSpace to deploy this deployment via kubectl or kustomize
3536

3637
</details>
3738

39+
40+
3841
<details className="config-field" data-expandable="true">
3942
<summary>
4043

4144
### `tanka` <span className="config-field-required" data-required="false">required</span> <span className="config-field-type"></span> <span className="config-field-default"></span> <span className="config-field-enum"></span> {#deployments-tanka}
4245

43-
Tanka tells DevSpace to deploy this deployment via tanka
46+
Tanka tells DevSpace to deployment via Tanka
4447

4548
</summary>
4649

@@ -49,6 +52,7 @@ Tanka tells DevSpace to deploy this deployment via tanka
4952

5053
</details>
5154

55+
5256
<PartialUpdateImageTags />
5357

5458

0 commit comments

Comments
 (0)