Skip to content

Commit 2db8a06

Browse files
authored
Update dependencies to support Kubernetes 1.28 (#38)
1 parent eaf7e7e commit 2db8a06

30 files changed

+113
-122
lines changed

.github/ISSUE_TEMPLATE/bug-report.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ assignees: ''
2424
* Kubernetes version (execute `kubectl version`):
2525
* kctrl version (execute `kctrl version`):
2626
* kapp-controller version (execute `kubectl get deployment -n kapp-controller kapp-controller -o yaml` and the annotation is `kbld.k14s.io/images`):
27+
* package version (execute `kctrl package installed get -i engineering-platform -n <namespace>`):

.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
21+
version: 0.11.0
2222
secrets:
2323
pull-request-token: ${{ secrets.GH_ORG_PAT }}

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
name: Integration Tests
1515
strategy:
1616
matrix:
17-
k8s_version: [v1.25, v1.26, v1.27]
17+
k8s_version: [v1.26, v1.27, v1.28]
1818
permissions:
1919
contents: read
2020
uses: kadras-io/github-reusable-workflows/.github/workflows/carvel-package-test-integration.yml@main

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ repo/
44
schema-openapi.yml
55

66
### KUTTL ###
7+
test/e2e/
78
test/integration/kubeconfig
89
test/integration/kuttl-artifacts
910
kubeconfig

Makefile

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
K8S_VERSION=v1.27
1+
K8S_VERSION=v1.28
22

33
# Build package configuration
44
build: package
@@ -12,8 +12,29 @@ prepare: test/setup
1212

1313
# Inner development loop
1414
dev: package
15+
kubectl config set-context --current --namespace=tests
1516
cd package && kctrl dev -f package-resources.yml --local -y
1617

18+
# Install e2e with 'standalone' profile
19+
e2e-standalone: package
20+
kubectl config set-context --current --namespace=tests
21+
cd package && ytt -f ../test/e2e/standalone -f package-resources.yml | kctrl dev -f- --local -y
22+
23+
# Install e2e with 'dev' profile
24+
e2e-dev: package
25+
kubectl config set-context --current --namespace=tests
26+
cd package && ytt -f ../test/e2e/dev -f package-resources.yml | kctrl dev -f- --local -y
27+
28+
# Install e2e with 'build' profile
29+
e2e-build: package
30+
kubectl config set-context --current --namespace=tests
31+
cd package && ytt -f ../test/e2e/build -f package-resources.yml | kctrl dev -f- --local -y
32+
33+
# Install e2e with 'run' profile
34+
e2e-run: package
35+
kubectl config set-context --current --namespace=tests
36+
cd package && ytt -f ../test/e2e/run -f package-resources.yml | kctrl dev -f- --local -y
37+
1738
# Clean development environment
1839
clean:
1940
cd package && kctrl dev -f package-resources.yml --local -y --delete

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ A curated set of Carvel packages to build an engineering platform supporting app
1212

1313
### Prerequisites
1414

15-
* Kubernetes 1.25+
15+
* Kubernetes 1.26+
1616
* Carvel [`kctrl`](https://carvel.dev/kapp-controller/docs/latest/install/#installing-kapp-controller-cli-kctrl) CLI.
1717
* Carvel [kapp-controller](https://carvel.dev/kapp-controller) deployed in your Kubernetes cluster. You can install it with Carvel [`kapp`](https://carvel.dev/kapp/docs/latest/install) (recommended choice) or `kubectl`.
1818

@@ -77,7 +77,7 @@ The Engineering Platform package can be customized via a `values.yml` file.
7777
platform:
7878
profile: run
7979
ingress:
80-
domain: thomasvitale.com
80+
domain: platform.kadras.io
8181
```
8282
8383
Reference the `values.yml` file from the `kctrl` command when installing or upgrading the package.
@@ -98,7 +98,7 @@ The Engineering Platform package has the following configurable properties.
9898

9999
| Config | Default | Description |
100100
|-------|-------------------|-------------|
101-
| `platform.profile` | `run` | The platform profile to install. Options: `full`, `dev`, `build`, `run`. |
101+
| `platform.profile` | `run` | The platform profile to install. Options: `standalone`, `dev`, `build`, `run`. |
102102
| `platform.supply_chain` | `basic` | The type of supply chain to deploy. Options: `basic`, `advanced`. |
103103
| `platform.namespace` | `kadras-packages` | The namespace where to install the platform. |
104104
| `platform.excluded_packages` | `[]` | A list of packages to exclude from being installed. |
@@ -110,12 +110,12 @@ The Engineering Platform package has the following configurable properties.
110110
| `platform.ingress.issuer.email` | `""` | The email address that Let's Encrypt will use to send info on expiring certificates or other issues. Required when the type is `letsencrypt_staging` or `letsencrypt`. |
111111
| `platform.oci_registry.server` | `""` | The server of the OCI Registry where the platform will publish OCI images. Example: "ghcr.io". |
112112
| `platform.oci_registry.repository` | `""` | The repository in the OCI Registry where the platform will publish OCI images. Example: "my-org". |
113-
| `platform.oci_registry.secret.name` | `""` | The name of the Secret holding the credentials to access the OCI registry. The credentials should provide read-only access to the OCI registry except when installing the platform with one of these profiles: `full`, `dev`, `build`. |
113+
| `platform.oci_registry.secret.name` | `""` | The name of the Secret holding the credentials to access the OCI registry. The credentials should provide read-only access to the OCI registry except when installing the platform with one of these profiles: `standalone`, `dev`, `build`. |
114114
| `platform.oci_registry.secret.namespace` | `kadras-packages` | The namespace of the Secret holding the credentials to access the OCI registry. |
115115
| `platform.cosign.secret.name` | `""` | The name of the Secret holding the Cosign key pair. |
116116
| `platform.cosign.secret.namespace` | `kadras-packages` | The namespace of the Secret holding the Cosign key pair. |
117117
| `platform.git.server` | `https://github.com` | The server hosting the Git repositories used by the plaform. |
118-
| `platform.git.secret.name` | `""` | The name of the Secret holding the credentials to access the Git server. The credentials should provide read-only access to the Git server except when installing the platform with one of these profiles: `full`, `build`. |
118+
| `platform.git.secret.name` | `""` | The name of the Secret holding the credentials to access the Git server. The credentials should provide read-only access to the Git server except when installing the platform with one of these profiles: `standalone`, `build`. |
119119
| `platform.git.secret.namespace` | `kadras-packages` | The namespace of the Secret holding the credentials to access the Git server. |
120120

121121
Each Kadras package included in the platform can be configured independently.

docs/install.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## 1. Prerequisites
44

5-
* Kubernetes 1.25+
5+
* Kubernetes 1.26+
66
* Carvel [`kctrl`](https://carvel.dev/kapp-controller/docs/latest/install/#installing-kapp-controller-cli-kctrl) CLI.
77
* Sigstore [`cosign`](https://docs.sigstore.dev/cosign/installation/) CLI.
88
* Carvel [kapp-controller](https://carvel.dev/kapp-controller) deployed in your Kubernetes cluster. You can install it with Carvel [`kapp`](https://carvel.dev/kapp/docs/latest/install) (recommended choice) or `kubectl`.
@@ -22,7 +22,7 @@ Add the Kadras repository to make all the platform packages available to the clu
2222
-n kadras-packages --create-namespace
2323
```
2424

25-
You can check the full list of available packages as follows.
25+
You can check the standalone list of available packages as follows.
2626

2727
```shell
2828
kctrl package available list -n kadras-packages

docs/workload.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
carto apps workload create band-service \
55
--git-repo https://github.com/ThomasVitale/band-service \
66
--git-branch main \
7-
--label "apps.kadras.io/workload-type=web"
7+
--label "app.kadras.io/workload-type=web"
88
```

package/config/components/buildpacks-catalog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#@ load("@ytt:yaml", "yaml")
44
#@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles")
55

6-
#@ if is_package_enabled("buildpacks-catalog") and is_any_profile_enabled([profiles.full, profiles.dev, profiles.build]):
6+
#@ if is_package_enabled("buildpacks-catalog") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]):
77

88
#@ def compute_package_values():
99
#@ values = struct.decode(data.values.buildpacks.catalog)
@@ -34,7 +34,7 @@ spec:
3434
packageRef:
3535
refName: buildpacks-catalog.packages.kadras.io
3636
versionSelection:
37-
constraints: 0.9.1
37+
constraints: 0.9.2
3838
prereleases: {}
3939
values:
4040
- secretRef:

package/config/components/cartographer-blueprints.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#@ load("@ytt:yaml", "yaml")
44
#@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles")
55

6-
#@ if is_package_enabled("cartographer-blueprints") and is_any_profile_enabled([profiles.full, profiles.dev, profiles.build, profiles.run]):
6+
#@ if is_package_enabled("cartographer-blueprints") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]):
77

88
#@ def compute_package_values():
99
#@ return data.values.cartographer.blueprints
@@ -26,7 +26,7 @@ spec:
2626
packageRef:
2727
refName: cartographer-blueprints.packages.kadras.io
2828
versionSelection:
29-
constraints: 0.6.1
29+
constraints: 0.7.4
3030
prereleases: {}
3131
values:
3232
- secretRef:

0 commit comments

Comments
 (0)