chore(deps): Update platform dependencies

ThomasVitale · ThomasVitale · commit a0ade958da68 · 2024-02-25T18:02:34.000+01:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -18,6 +18,6 @@ jobs:
       registry-server: ghcr.io
       registry-username: ${{ github.actor }}
       image: ${{ github.repository }}
-      version: 0.12.2
+      version: 0.13.0
     secrets:
       pull-request-token: ${{ secrets.GH_ORG_PAT }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,7 @@ jobs:
     name: Integration Tests
     strategy:
       matrix:
-        k8s_version: [v1.26, v1.27, v1.28]
+        k8s_version: [v1.27, v1.28, v1.29]
     permissions:
       contents: read
     uses: kadras-io/github-reusable-workflows/.github/workflows/carvel-package-test-integration.yml@main
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-K8S_VERSION=v1.28
+K8S_VERSION=v1.29
 
 # Build package configuration
 build: package
diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ A curated set of Carvel packages to build an engineering platform supporting app
 
 ### Prerequisites
 
-* Kubernetes 1.26+
+* Kubernetes 1.27+
 * Carvel [`kctrl`](https://carvel.dev/kapp-controller/docs/latest/install/#installing-kapp-controller-cli-kctrl) CLI.
 * 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`.
 
@@ -130,6 +130,8 @@ Each Kadras package included in the platform can be configured independently.
 | `cert_manager.issuers` | `{}` | Configuration for the Cert Manager Issuers package. |
 | `contour` | `{}` | Configuration for the Contour package. |
 | `conventions.spring_boot` | `{}` | Configuration for the Spring Boot Conventions package. |
+| `crossplane` | `{}` | Configuration for the Crossplane package. |
+| `dapr` | `{}` | Configuration for the Dapr package. |
 | `flux` | `{}` | Configuration for the Flux package. |
 | `knative.serving` | `{}` | Configuration for the Knative Serving package. |
 | `kyverno.core` | `{}` | Configuration for the Kyverno package. |
diff --git a/package/config/components/buildpacks-catalog.yml b/package/config/components/buildpacks-catalog.yml
@@ -34,7 +34,7 @@ spec:
   packageRef:
     refName: buildpacks-catalog.packages.kadras.io
     versionSelection:
-      constraints: 0.9.5
+      constraints: 0.10.0
       prereleases: {}
   values:
   - secretRef:
diff --git a/package/config/components/cartographer.yml b/package/config/components/cartographer.yml
@@ -31,7 +31,7 @@ spec:
   packageRef:
     refName: cartographer.packages.kadras.io
     versionSelection:
-      constraints: 0.8.5
+      constraints: 0.8.5+kadras.1
       prereleases: {}
   values:
   - secretRef:
diff --git a/package/config/components/cert-manager-issuers.yml b/package/config/components/cert-manager-issuers.yml
@@ -47,7 +47,7 @@ spec:
   packageRef:
     refName: cert-manager-issuers.packages.kadras.io
     versionSelection:
-      constraints: 0.2.2
+      constraints: 0.2.3
       prereleases: {}
   values:
     - secretRef:
diff --git a/package/config/components/cert-manager.yml b/package/config/components/cert-manager.yml
@@ -23,7 +23,7 @@ spec:
   packageRef:
     refName: cert-manager.packages.kadras.io
     versionSelection:
-      constraints: 1.13.2
+      constraints: 1.14.3
       prereleases: {}
   values:
     - secretRef:
diff --git a/package/config/components/contour.yml b/package/config/components/contour.yml
@@ -37,7 +37,7 @@ spec:
   packageRef:
     refName: contour.packages.kadras.io
     versionSelection:
-      constraints: 1.27.0
+      constraints: 1.28.1
   values:
     - secretRef:
         name: contour-values
diff --git a/package/config/components/crossplane.yml b/package/config/components/crossplane.yml
@@ -0,0 +1,41 @@
+#@ load("@ytt:data", "data")
+#@ load("@ytt:struct", "struct")
+#@ load("@ytt:yaml", "yaml")
+#@ load("/helpers.star", "is_package_additional")
+
+#@ if is_package_additional("crossplane"):
+
+#@ def compute_package_values():
+#@   values = struct.decode(data.values.crossplane)
+#@   return struct.encode(values)
+#@ end
+
+---
+apiVersion: packaging.carvel.dev/v1alpha1
+kind: PackageInstall
+metadata:
+  name: crossplane
+  namespace: #@ data.values.platform.namespace
+  annotations:
+    kapp.k14s.io/change-group: crossplane
+    kapp.k14s.io/change-rule.cert-manager: upsert after upserting cert-manager
+    kapp.k14s.io/change-rule.serviceaccount: delete before deleting serviceaccount
+spec:
+  serviceAccountName: kadras-install-sa
+  packageRef:
+    refName: crossplane.packages.kadras.io
+    versionSelection:
+      constraints: 1.15.0
+  values:
+    - secretRef:
+        name: crossplane-values
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: crossplane-values
+  namespace: #@ data.values.platform.namespace
+stringData:
+  values.yaml: #@ yaml.encode(compute_package_values())
+
+#@ end
diff --git a/package/config/components/dapr.yml b/package/config/components/dapr.yml
@@ -0,0 +1,41 @@
+#@ load("@ytt:data", "data")
+#@ load("@ytt:struct", "struct")
+#@ load("@ytt:yaml", "yaml")
+#@ load("/helpers.star", "is_package_additional")
+
+#@ if is_package_additional("dapr"):
+
+#@ def compute_package_values():
+#@   values = struct.decode(data.values.dapr)
+#@   return struct.encode(values)
+#@ end
+
+---
+apiVersion: packaging.carvel.dev/v1alpha1
+kind: PackageInstall
+metadata:
+  name: dapr
+  namespace: #@ data.values.platform.namespace
+  annotations:
+    kapp.k14s.io/change-group: dapr
+    kapp.k14s.io/change-rule.cert-manager: upsert after upserting cert-manager
+    kapp.k14s.io/change-rule.serviceaccount: delete before deleting serviceaccount
+spec:
+  serviceAccountName: kadras-install-sa
+  packageRef:
+    refName: dapr.packages.kadras.io
+    versionSelection:
+      constraints: 1.12.5
+  values:
+    - secretRef:
+        name: dapr-values
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: dapr-values
+  namespace: #@ data.values.platform.namespace
+stringData:
+  values.yaml: #@ yaml.encode(compute_package_values())
+
+#@ end
diff --git a/package/config/components/flux.yml b/package/config/components/flux.yml
@@ -33,7 +33,7 @@ spec:
   packageRef:
     refName: flux.packages.kadras.io
     versionSelection:
-      constraints: 2.1.2
+      constraints: 2.2.3
   values:
     - secretRef:
         name: flux-values
diff --git a/package/config/components/knative-serving.yml b/package/config/components/knative-serving.yml
@@ -42,7 +42,7 @@ spec:
   packageRef:
     refName: knative-serving.packages.kadras.io
     versionSelection:
-      constraints: 1.12.1
+      constraints: 1.13.1
   values:
     - secretRef:
         name: knative-serving-values
diff --git a/package/config/components/kpack.yml b/package/config/components/kpack.yml
@@ -54,7 +54,7 @@ spec:
   packageRef:
     refName: kpack.packages.kadras.io
     versionSelection:
-      constraints: 0.12.3
+      constraints: 0.13.2
       prereleases: {}
   values:
   - secretRef:
diff --git a/package/config/components/kyverno.yml b/package/config/components/kyverno.yml
@@ -1,9 +1,9 @@
 #@ load("@ytt:data", "data")
 #@ load("@ytt:struct", "struct")
 #@ load("@ytt:yaml", "yaml")
-#@ load("/helpers.star", "is_package_enabled")
+#@ load("/helpers.star", "is_package_additional")
 
-#@ if is_package_enabled("kyverno"):
+#@ if is_package_additional("kyverno"):
 
 #@ def compute_package_values():
 #@   values = struct.decode(data.values.kyverno.core)
@@ -30,7 +30,7 @@ spec:
   packageRef:
     refName: kyverno.packages.kadras.io
     versionSelection:
-      constraints: 1.10.5
+      constraints: 1.11.4
   values:
     - secretRef:
         name: kyverno-values
diff --git a/package/config/components/metrics-server.yml b/package/config/components/metrics-server.yml
@@ -23,7 +23,7 @@ spec:
   packageRef:
     refName: metrics-server.packages.kadras.io
     versionSelection:
-      constraints: 0.6.4
+      constraints: 0.7.0
       prereleases: {}
   values:
   - secretRef:
diff --git a/package/config/components/secretgen-controller.yml b/package/config/components/secretgen-controller.yml
@@ -23,7 +23,7 @@ spec:
   packageRef:
     refName: secretgen-controller.packages.kadras.io
     versionSelection:
-      constraints: 0.15.1
+      constraints: 0.17.0
       prereleases: {}
   values:
   - secretRef:
diff --git a/package/config/components/spring-boot-conventions.yml b/package/config/components/spring-boot-conventions.yml
@@ -24,7 +24,7 @@ spec:
   packageRef:
     refName: spring-boot-conventions.packages.kadras.io
     versionSelection:
-      constraints: 0.3.2
+      constraints: 0.4.0
   values:
     - secretRef:
         name: spring-boot-conventions-values
diff --git a/package/config/components/tekton-pipelines.yml b/package/config/components/tekton-pipelines.yml
@@ -30,7 +30,7 @@ spec:
   packageRef:
     refName: tekton-pipelines.packages.kadras.io
     versionSelection:
-      constraints: 0.53.2
+      constraints: 0.53.3
       prereleases: {}
   values:
   - secretRef:
diff --git a/package/config/helpers.star b/package/config/helpers.star
@@ -8,6 +8,10 @@ profiles = struct.make(
   run="run"
 )
 
+def is_package_additional(name):
+  return (name in data.values.platform.additional_packages) and is_package_enabled(name)
+end
+
 def is_package_enabled(name):
   return (name not in data.values.platform.excluded_packages)
 end
diff --git a/package/config/values-schema.yml b/package/config/values-schema.yml
@@ -12,6 +12,9 @@ platform:
   supply_chain: basic
   #@schema/desc "The namespace where to install the platform."
   namespace: kadras-packages
+  #@schema/desc "A list of packages to include in the installation."
+  additional_packages:
+    - ""
   #@schema/desc "A list of packages to exclude from being installed."
   excluded_packages:
     - ""
@@ -113,6 +116,14 @@ conventions:
   #@schema/type any=True
   spring_boot: {}
 
+#@schema/desc "Configuration for the Crossplane package."
+#@schema/type any=True
+crossplane: {}
+
+#@schema/desc "Configuration for the Dapr package."
+#@schema/type any=True
+dapr: {}
+
 #@schema/desc "Configuration for the Flux package."
 #@schema/type any=True
 flux: {}
diff --git a/test/integration/run/config/values.yml b/test/integration/run/config/values.yml
@@ -13,4 +13,3 @@ stringData:
         domain: 127.0.0.1.sslip.io
       excluded_packages:
         - flux
-        - kyverno
diff --git a/test/setup/kind/v1.27/kind-config.yml b/test/setup/kind/v1.27/kind-config.yml
@@ -3,9 +3,9 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.27.3
+  image: kindest/node:v1.27.11
 - role: worker
-  image: kindest/node:v1.27.3
+  image: kindest/node:v1.27.11
   extraPortMappings:
   - containerPort: 80
     hostPort: 80
diff --git a/test/setup/kind/v1.28/kind-config.yml b/test/setup/kind/v1.28/kind-config.yml
@@ -3,9 +3,9 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.28.0
+  image: kindest/node:v1.28.7
 - role: worker
-  image: kindest/node:v1.28.0
+  image: kindest/node:v1.28.7
   extraPortMappings:
   - containerPort: 80
     hostPort: 80
diff --git a/test/setup/kind/v1.29/kind-config.yml b/test/setup/kind/v1.29/kind-config.yml
@@ -3,9 +3,9 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.26.6
+  image: kindest/node:v1.29.2
 - role: worker
-  image: kindest/node:v1.26.6
+  image: kindest/node:v1.29.2
   extraPortMappings:
   - containerPort: 80
     hostPort: 80

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-K8S_VERSION=v1.28`
	`1`	`+K8S_VERSION=v1.29`
`2`	`2`
`3`	`3`	`# Build package configuration`
`4`	`4`	`build: package`