Skip to content

Commit c156231

Browse files
authored
Update platform dependencies (#13)
1 parent ad98d1b commit c156231

21 files changed

+58
-21
lines changed

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ jobs:
1818
registry-server: ghcr.io
1919
registry-username: ${{ github.actor }}
2020
image: ${{ github.repository }}
21-
version: 0.10.0-RC3
21+
version: 0.10.0-RC4
2222
secrets:
2323
pull-request-token: ${{ secrets.GH_ORG_PAT }}

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ The Engineering Platform package has the following configurable properties.
9999
| Config | Default | Description |
100100
|-------|-------------------|-------------|
101101
| `platform.profile` | `full` | The platform profile to install. Options: `full`, `serving`. |
102+
| `platform.supply_chain` | `basic` | The type of supply chain to deploy. Options: `basic`, `advanced`. |
102103
| `platform.namespace` | `kadras-packages` | The namespace where to install the platform. |
103104
| `platform.excluded_packages` | `[]` | A list of packages to exclude from being installed. |
104105
| `platform.ca_cert_data` | `""` | PEM-encoded certificate data to trust TLS connections with a custom CA. |

docs/install.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,9 @@ Then, create a Secret with the credentials to access your Git server in read/wri
7474

7575
```shell
7676
kubectl create secret generic supply-chain-git-credentials \
77-
--from-literal=username"${SUPPLY_CHAIN_REGISTRY_USERNAME}" \
78-
--from-literal=password="${SUPPLY_CHAIN_REGISTRY_TOKEN}" \
77+
--type=kubernetes.io/basic-auth \
78+
--from-literal=username="${SUPPLY_CHAIN_GIT_USERNAME}" \
79+
--from-literal=password="${SUPPLY_CHAIN_GIT_TOKEN}" \
7980
--namespace=kadras-packages
8081
```
8182

package/config/buildpacks-catalog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
packageRef:
3535
refName: buildpacks-catalog.packages.kadras.io
3636
versionSelection:
37-
constraints: 0.8.0
37+
constraints: 0.9.1
3838
prereleases: {}
3939
values:
4040
- secretRef:

package/config/cartographer-blueprints.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ spec:
2626
packageRef:
2727
refName: cartographer-blueprints.packages.kadras.io
2828
versionSelection:
29-
constraints: 0.5.1
29+
constraints: 0.6.1
3030
prereleases: {}
3131
values:
3232
- secretRef:

package/config/cartographer-delivery.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@
66
#@ if is_package_enabled("cartographer-delivery") and is_any_profile_enabled([profiles.full]):
77

88
#@ def compute_package_values():
9-
#@ return data.values.cartographer.delivery
9+
#@ values = struct.decode(data.values.cartographer.delivery)
10+
#@
11+
#@ #! Compute values for Git server
12+
#@ if is_any_profile_enabled([profiles.full]):
13+
#@ if data.values.platform.git.server and data.values.platform.git.secret.name and data.values.platform.git.secret.namespace:
14+
#@ if not hasattr(data.values.cartographer.delivery, "git_credentials_secret") or not data.values.cartographer.delivery.git_credentials_secret:
15+
#@ values["git_credentials_secret"] = data.values.platform.git.secret.name
16+
#@ end
17+
#@ end
18+
#@ end
19+
#@
20+
#@ return struct.encode(values)
1021
#@ end
1122

1223
---
@@ -25,7 +36,7 @@ spec:
2536
packageRef:
2637
refName: cartographer-delivery.packages.kadras.io
2738
versionSelection:
28-
constraints: 0.4.1
39+
constraints: 0.5.0
2940
prereleases: {}
3041
values:
3142
- secretRef:

package/config/cartographer-supply-chains.yml

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,18 @@
88
#@ def compute_package_values():
99
#@ values = struct.decode(data.values.cartographer.supply_chains)
1010
#@
11+
#@ #! Compute values for CA Certificates
12+
#@ if data.values.platform.ca_cert_data:
13+
#@ values["ca_cert_data"] = values["ca_cert_data"] + data.values.platform.ca_cert_data
14+
#@ end
15+
#@
16+
#@ #! Compute values for Supply Chain
17+
#@ if data.values.platform.supply_chain:
18+
#@ if not hasattr(data.values.cartographer.supply_chains, "supply_chain") or not data.values.cartographer.supply_chains.supply_chain:
19+
#@ values["supply_chain"] = data.values.platform.supply_chain
20+
#@ end
21+
#@ end
22+
#@
1123
#@ #! Compute values for OCI Registry server
1224
#@ if data.values.platform.oci_registry.server and data.values.platform.oci_registry.repository:
1325
#@ if not hasattr(data.values.cartographer.supply_chains, "registry") or not hasattr(data.values.cartographer.supply_chains.registry, "server") or not hasattr(data.values.cartographer.supply_chains.registry, "repository") or not data.values.cartographer.supply_chains.registry.server or not data.values.cartographer.supply_chains.registry.repository:
@@ -17,6 +29,15 @@
1729
#@ end
1830
#@ end
1931
#@
32+
#@ #! Compute values for Git server
33+
#@ if is_any_profile_enabled([profiles.full]):
34+
#@ if data.values.platform.git.server and data.values.platform.git.secret.name and data.values.platform.git.secret.namespace:
35+
#@ if not hasattr(data.values.cartographer.supply_chains, "git_credentials_secret") or not data.values.cartographer.supply_chains.git_credentials_secret:
36+
#@ values["git_credentials_secret"] = data.values.platform.git.secret.name
37+
#@ end
38+
#@ end
39+
#@ end
40+
#@
2041
#@ return struct.encode(values)
2142
#@ end
2243

@@ -36,7 +57,7 @@ spec:
3657
packageRef:
3758
refName: cartographer-supply-chains.packages.kadras.io
3859
versionSelection:
39-
constraints: 0.5.1
60+
constraints: 0.6.0
4061
prereleases: {}
4162
values:
4263
- secretRef:

package/config/cartographer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ spec:
3131
packageRef:
3232
refName: cartographer.packages.kadras.io
3333
versionSelection:
34-
constraints: 0.7.1+tap.1
34+
constraints: 0.7.3
3535
prereleases: {}
3636
values:
3737
- secretRef:

package/config/cert-manager-issuers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ spec:
4747
packageRef:
4848
refName: cert-manager-issuers.packages.kadras.io
4949
versionSelection:
50-
constraints: 0.2.1
50+
constraints: 0.2.2
5151
prereleases: {}
5252
values:
5353
- secretRef:

package/config/cert-manager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ spec:
2323
packageRef:
2424
refName: cert-manager.packages.kadras.io
2525
versionSelection:
26-
constraints: 1.12.2
26+
constraints: 1.12.3
2727
prereleases: {}
2828
values:
2929
- secretRef:

0 commit comments

Comments
 (0)