Skip to content

Commit

Permalink
chore: Update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
ThomasVitale committed Jun 17, 2024
1 parent 2a5e1bc commit 78feeea
Show file tree
Hide file tree
Showing 17 changed files with 55 additions and 102 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ jobs:
registry-server: ghcr.io
registry-username: ${{ github.actor }}
image: ${{ github.repository }}
version: 0.16.0
version: 0.17.0
secrets:
pull-request-token: ${{ secrets.GH_ORG_PAT }}
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ The Engineering Platform package has the following configurable properties.
| `platform.namespace` | `kadras-system` | The namespace where to install the platform. |
| `platform.excluded_packages` | `[]` | A list of packages to exclude from being installed. |
| `platform.ca_cert_data` | `""` | PEM-encoded certificate data to trust TLS connections with a custom CA. |
| `platform.infrastructure_provider` | `""` | The underlying infrastructure provider. Options are `local` and `vsphere`. This field is not required, but it enables better validation and defaulting if provided. |
| `platform.ingress.domain` | `""` | The base domain name the platform will use to configure the Ingress controller. It must be a valid DNS name. |
| `platform.ingress.issuer.type` | `private` | The type of ClusterIssuer the platform will use to enable TLS communications. Options: `private`, `letsencrypt_staging`, `letsencrypt`, `custom`. |
| `platform.ingress.issuer.name` | `""` | A reference to a custom ClusterIssuer previously created on the cluster where the platform will be installed. Required when the type is `custom`. |
Expand All @@ -123,8 +122,7 @@ Each Kadras package included in the platform can be configured independently.
|-------|-------------------|-------------|
| `buildpacks.catalog` | `{}` | Configuration for the Buildpacks Catalog package. |
| `buildpacks.kpack` | `{}` | Configuration for the Kpack package. |
| `cert_manager.core` | `{}` | Configuration for the Cert Manager package. |
| `cert_manager.issuers` | `{}` | Configuration for the Cert Manager Issuers package. |
| `cert_manager` | `{}` | Configuration for the Cert Manager package. |
| `contour` | `{}` | Configuration for the Contour package. |
| `crossplane` | `{}` | Configuration for the Crossplane package. |
| `dapr` | `{}` | Configuration for the Dapr package. |
Expand Down
9 changes: 6 additions & 3 deletions docs/quick-start/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Add the Kadras repository to make the platform packages available to the cluster

```shell
kctrl package repository add -r kadras-packages \
--url ghcr.io/kadras-io/kadras-packages:0.18.0 \
--url ghcr.io/kadras-io/kadras-packages:0.19.0 \
-n kadras-system --create-namespace
```

Expand All @@ -61,9 +61,12 @@ The installation of the Kadras Engineering Platform can be configured via YAML.
```yaml title="values.yml"
platform:
profile: run
infrastructure_provider: local
ingress:
domain: 127.0.0.1.sslip.io
contour:
envoy:
service:
type: NodePort
```

The Ingress is configured with the special domain `127.0.0.1.sslip.io` which will resolve to your localhost and be accessible via the kind cluster.
Expand All @@ -75,7 +78,7 @@ Reference the `values.yml` file you created in the previous step and install the
```shell
kctrl package install -i engineering-platform \
-p engineering-platform.packages.kadras.io \
-v 0.16.0 \
-v 0.17.0 \
-n kadras-system \
--values-file values.yml
```
Expand Down
2 changes: 1 addition & 1 deletion package/config/components/buildpacks-catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
packageRef:
refName: buildpacks-catalog.packages.kadras.io
versionSelection:
constraints: 0.11.0
constraints: 0.12.0
prereleases: {}
values:
- secretRef:
Expand Down
64 changes: 0 additions & 64 deletions package/config/components/cert-manager-issuers.yml

This file was deleted.

27 changes: 25 additions & 2 deletions package/config/components/cert-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,31 @@

#@ if is_package_enabled("cert-manager"):

#@ def is_letsencrypt_issuer(issuer):
#@ return issuer.type == "letsencrypt_staging" or issuer.type == "letsencrypt"
#@ end

#@ def is_letsencrypt_production(issuer):
#@ if issuer.type == "letsencrypt_staging":
#@ return False
#@ else:
#@ return True
#@ end
#@ end

#@ def compute_package_values():
#@ return data.values.cert_manager.core
#@ values = struct.decode(data.values.cert_manager)
#@
#@ if data.values.platform.ingress.issuer and is_letsencrypt_issuer(data.values.platform.ingress.issuer) and data.values.platform.ingress.issuer.email:
#@ if not hasattr(data.values.cert_manager, "letsencrypt") or not hasattr(data.values.cert_manager.letsencrypt, "include") or not data.values.cert_manager.letsencrypt.include:
#@ values["letsencrypt"] = {}
#@ values["letsencrypt"]["include"] = True
#@ values["letsencrypt"]["production"] = is_letsencrypt_production(data.values.platform.ingress.issuer)
#@ values["letsencrypt"]["email"] = data.values.platform.ingress.issuer.email
#@ end
#@ end
#@
#@ return struct.encode(values)
#@ end

---
Expand All @@ -23,7 +46,7 @@ spec:
packageRef:
refName: cert-manager.packages.kadras.io
versionSelection:
constraints: 1.14.5
constraints: 1.15.0+kadras.1
prereleases: {}
values:
- secretRef:
Expand Down
6 changes: 1 addition & 5 deletions package/config/components/contour.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@
#@ end
#@ end
#@
#@ if not hasattr(data.values.contour, "infrastructure_provider"):
#@ values["infrastructure_provider"] = data.values.platform.infrastructure_provider
#@ end
#@
#@ return struct.encode(values)
#@ end

Expand All @@ -37,7 +33,7 @@ spec:
packageRef:
refName: contour.packages.kadras.io
versionSelection:
constraints: 1.29.0
constraints: 1.29.1
values:
- secretRef:
name: contour-values
Expand Down
2 changes: 1 addition & 1 deletion package/config/components/dapr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
packageRef:
refName: dapr.packages.kadras.io
versionSelection:
constraints: 1.13.2
constraints: 1.13.4
values:
- secretRef:
name: dapr-values
Expand Down
4 changes: 2 additions & 2 deletions package/config/components/knative-serving.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,15 @@ metadata:
namespace: #@ data.values.platform.namespace
annotations:
kapp.k14s.io/change-group: knative-serving
kapp.k14s.io/change-rule.cert-manager-issuers: upsert after upserting cert-manager-issuers
kapp.k14s.io/change-rule.cert-manager: upsert after upserting cert-manager
kapp.k14s.io/change-rule.contour: upsert after upserting contour
kapp.k14s.io/change-rule.serviceaccount: delete before deleting serviceaccount
spec:
serviceAccountName: kadras-install-sa
packageRef:
refName: knative-serving.packages.kadras.io
versionSelection:
constraints: 1.14.0
constraints: 1.14.1
values:
- secretRef:
name: knative-serving-values
Expand Down
2 changes: 1 addition & 1 deletion package/config/components/kpack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ spec:
packageRef:
refName: kpack.packages.kadras.io
versionSelection:
constraints: 0.13.3
constraints: 0.14.1
prereleases: {}
values:
- secretRef:
Expand Down
2 changes: 1 addition & 1 deletion package/config/components/kyverno.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
packageRef:
refName: kyverno.packages.kadras.io
versionSelection:
constraints: 1.12.1
constraints: 1.12.4
values:
- secretRef:
name: kyverno-values
Expand Down
2 changes: 1 addition & 1 deletion package/config/components/postgresql-operator.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ spec:
packageRef:
refName: postgresql-operator.packages.kadras.io
versionSelection:
constraints: 1.23.1
constraints: 1.23.2
values:
- secretRef:
name: postgresql-operator-values
Expand Down
2 changes: 1 addition & 1 deletion package/config/components/weaviate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ spec:
packageRef:
refName: weaviate.packages.kadras.io
versionSelection:
constraints: 1.25.1
constraints: 1.25.4
values:
- secretRef:
name: weaviate-values
Expand Down
2 changes: 1 addition & 1 deletion package/config/helpers.star
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ def get_issuer_name(issuer):
elif issuer.type == "letsencrypt_staging":
return "letsencrypt-staging-http01-issuer"
elif issuer.type == "letsencrypt":
return "letsencrypt-http01-issuer"
return "letsencrypt-prod-http01-issuer"
elif issuer.type == "custom":
return issuer.name
end
Expand Down
16 changes: 3 additions & 13 deletions package/config/values-schema.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,6 @@ platform:
#@schema/desc "PEM-encoded certificate data to trust TLS connections with a custom CA."
ca_cert_data: ""

#@schema/desc "The underlying infrastructure provider. Options are `local` and `vsphere`. This field is not required, but it enables better validation and defaulting if provided."
#@schema/validation one_of=["local", "vsphere"]
#@schema/nullable
infrastructure_provider: ""

#@schema/desc "Setting for the Ingress controller that the platform will use."
ingress:
#@schema/desc "The base domain name the platform will use to configure the Ingress controller. It must be a valid DNS name."
Expand Down Expand Up @@ -85,14 +80,9 @@ buildpacks:
#@schema/type any=True
kpack: {}

#@schema/desc "Configuration for the Cert Manager related packages."
cert_manager:
#@schema/desc "Configuration for the Cert Manager package."
#@schema/type any=True
core: {}
#@schema/desc "Configuration for the Cert Manager Issuers package."
#@schema/type any=True
issuers: {}
#@schema/desc "Configuration for the Cert Manager package."
#@schema/type any=True
cert_manager: {}

#@schema/desc "Configuration for the Contour package."
#@schema/type any=True
Expand Down
5 changes: 4 additions & 1 deletion test/integration/run/config/values.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,11 @@ stringData:
values.yaml: |
platform:
profile: run
infrastructure_provider: local
ingress:
domain: 127.0.0.1.sslip.io
excluded_packages:
- flux
contour:
envoy:
service:
type: NodePort
6 changes: 5 additions & 1 deletion test/unit/config/values.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
---

platform:
infrastructure_provider: local

ingress:
domain: kadras.io
Expand All @@ -23,3 +22,8 @@ platform:
secret:
name: supply-chain-git-credentials
namespace: kadras-system

contour:
envoy:
service:
type: NodePort

0 comments on commit 78feeea

Please sign in to comment.