diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e135719..4672892 100644 --- 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.20.1 + version: 0.21.0 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }} diff --git a/README.md b/README.md index a705e28..8967847 100644 --- a/README.md +++ b/README.md @@ -121,8 +121,6 @@ Each Kadras package included in the platform can be configured independently. | Config | Default | Description | |-------|-------------------|-------------| -| `buildpacks.catalog` | `{}` | Configuration for the Buildpacks Catalog package. | -| `buildpacks.kpack` | `{}` | Configuration for the Kpack package. | | `cert_manager` | `{}` | Configuration for the Cert Manager package. | | `contour` | `{}` | Configuration for the Contour package. | | `crossplane` | `{}` | Configuration for the Crossplane package. | @@ -138,7 +136,6 @@ Each Kadras package included in the platform can be configured independently. | `rabbitmq_operator` | `{}` | Configuration for the RabbitMQ Operator package. | | `secretgen_controller` | `{}` | Configuration for the Secretgen Controller package. | | `service_binding` | `{}` | Configuration for the Service Binding package. | -| `tekton.pipelines` | `{}` | Configuration for the Tekton Pipelines package. | | `tempo_operator` | `{}` | Configuration for the Tempo Operator package. | | `workspace_provisioner` | `{}` | Configuration for the Workspace Provisioner package. | diff --git a/docs/quick-start/getting-started.md b/docs/quick-start/getting-started.md index 4de5fbd..bd41806 100644 --- a/docs/quick-start/getting-started.md +++ b/docs/quick-start/getting-started.md @@ -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.22.1 \ + --url ghcr.io/kadras-io/kadras-packages:0.23.0 \ -n kadras-system --create-namespace ``` @@ -78,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.20.1 \ + -v 0.21.0 \ -n kadras-system \ --values-file values.yml ``` diff --git a/package/config/components/buildpacks-catalog.yml b/package/config/components/buildpacks-catalog.yml deleted file mode 100644 index 7f002a9..0000000 --- a/package/config/components/buildpacks-catalog.yml +++ /dev/null @@ -1,51 +0,0 @@ -#@ load("@ytt:data", "data") -#@ load("@ytt:struct", "struct") -#@ load("@ytt:yaml", "yaml") -#@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles") - -#@ if is_package_enabled("buildpacks-catalog") and is_any_profile_enabled([profiles.standalone, profiles.build]): - -#@ def compute_package_values(): -#@ values = struct.decode(data.values.buildpacks.catalog) -#@ -#@ #! Compute values for OCI Registry server -#@ if data.values.platform.oci_registry.server and data.values.platform.oci_registry.repository: -#@ if not hasattr(data.values.buildpacks.catalog, "kp_default_repository") or not hasattr(data.values.buildpacks.catalog.kp_default_repository, "name") or not data.values.buildpacks.catalog.kp_default_repository.name: -#@ values["kp_default_repository"] = {} -#@ values["kp_default_repository"]["name"] = data.values.platform.oci_registry.server.rstrip("/") + "/" + data.values.platform.oci_registry.repository.rstrip("/") + "/buildpacks" -#@ end -#@ end -#@ -#@ return struct.encode(values) -#@ end - ---- -apiVersion: packaging.carvel.dev/v1alpha1 -kind: PackageInstall -metadata: - name: buildpacks-catalog - namespace: #@ data.values.platform.namespace - annotations: - kapp.k14s.io/change-group: buildpacks-catalog - kapp.k14s.io/change-rule.kpack: upsert after upserting kpack - kapp.k14s.io/change-rule.service-account: delete before deleting serviceaccount -spec: - serviceAccountName: kadras-install-sa - packageRef: - refName: buildpacks-catalog.packages.kadras.io - versionSelection: - constraints: 0.12.3 - prereleases: {} - values: - - secretRef: - name: buildpacks-catalog-values ---- -apiVersion: v1 -kind: Secret -metadata: - name: buildpacks-catalog-values - namespace: #@ data.values.platform.namespace -stringData: - values.yaml: #@ yaml.encode(compute_package_values()) - -#@ end diff --git a/package/config/components/cert-manager.yml b/package/config/components/cert-manager.yml index 6400623..8ae9bbc 100644 --- a/package/config/components/cert-manager.yml +++ b/package/config/components/cert-manager.yml @@ -46,7 +46,7 @@ spec: packageRef: refName: cert-manager.packages.kadras.io versionSelection: - constraints: 1.15.3 + constraints: 1.16.1 prereleases: {} values: - secretRef: diff --git a/package/config/components/crossplane.yml b/package/config/components/crossplane.yml index ad98c49..f70ee2a 100644 --- a/package/config/components/crossplane.yml +++ b/package/config/components/crossplane.yml @@ -25,7 +25,7 @@ spec: packageRef: refName: crossplane.packages.kadras.io versionSelection: - constraints: 1.17.1 + constraints: 1.17.1+kadras.io values: - secretRef: name: crossplane-values diff --git a/package/config/components/dependency-track.yml b/package/config/components/dependency-track.yml index bf21989..000e26b 100644 --- a/package/config/components/dependency-track.yml +++ b/package/config/components/dependency-track.yml @@ -28,7 +28,7 @@ spec: packageRef: refName: dependency-track.packages.kadras.io versionSelection: - constraints: 4.11.7 + constraints: 4.12.0 values: - secretRef: name: dependency-track-values diff --git a/package/config/components/developer-portal.yml b/package/config/components/developer-portal.yml index 1675487..4b8bc37 100644 --- a/package/config/components/developer-portal.yml +++ b/package/config/components/developer-portal.yml @@ -26,7 +26,7 @@ spec: packageRef: refName: developer-portal.packages.kadras.io versionSelection: - constraints: 0.3.0 + constraints: 0.4.0 values: - secretRef: name: developer-portal-values diff --git a/package/config/components/flux.yml b/package/config/components/flux.yml index c27d072..44c463e 100644 --- a/package/config/components/flux.yml +++ b/package/config/components/flux.yml @@ -24,7 +24,7 @@ spec: packageRef: refName: flux.packages.kadras.io versionSelection: - constraints: 2.3.0 + constraints: 2.4.0 values: - secretRef: name: flux-values diff --git a/package/config/components/knative-serving.yml b/package/config/components/knative-serving.yml index 9923cb5..cc5b308 100644 --- 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.15.2 + constraints: 1.16.0 values: - secretRef: name: knative-serving-values diff --git a/package/config/components/kpack.yml b/package/config/components/kpack.yml deleted file mode 100644 index 1e23970..0000000 --- a/package/config/components/kpack.yml +++ /dev/null @@ -1,71 +0,0 @@ -#@ load("@ytt:data", "data") -#@ load("@ytt:struct", "struct") -#@ load("@ytt:yaml", "yaml") -#@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles") - -#@ if is_package_enabled("kpack") and is_any_profile_enabled([profiles.standalone, profiles.build]): - -#@ def compute_package_values(): -#@ values = { -#@ "ca_cert_data": "", -#@ "kp_default_repository": {} -#@ } -#@ -#@ if data.values.buildpacks.kpack: -#@ values.update(struct.decode(data.values.buildpacks.kpack)) -#@ end -#@ -#@ #! Compute values for CA Certificates -#@ if data.values.platform.ca_cert_data: -#@ values["ca_cert_data"] = values["ca_cert_data"] + data.values.platform.ca_cert_data -#@ end -#@ -#@ #! Compute values for OCI Registry server -#@ if data.values.platform.oci_registry.server and data.values.platform.oci_registry.repository: -#@ if not hasattr(data.values.buildpacks.kpack, "kp_default_repository") or not hasattr(data.values.buildpacks.kpack.kp_default_repository, "name") or not data.values.buildpacks.kpack.kp_default_repository.name: -#@ values["kp_default_repository"]["name"] = data.values.platform.oci_registry.server.rstrip("/") + "/" + data.values.platform.oci_registry.repository.rstrip("/") + "/buildpacks" -#@ end -#@ end -#@ -#@ #! Compute values for OCI Registry secret -#@ if data.values.platform.oci_registry.secret.name and data.values.platform.oci_registry.secret.namespace: -#@ if not hasattr(data.values.buildpacks.kpack, "kp_default_repository") or not hasattr(data.values.buildpacks.kpack.kp_default_repository, "secret") or not hasattr(data.values.buildpacks.kpack.kp_default_repository.secret, "name") or not hasattr(data.values.buildpacks.kpack.kp_default_repository.secret, "namespace") or not data.values.buildpacks.kpack.kp_default_repository.secret.name or not data.values.buildpacks.kpack.kp_default_repository.secret.namespace: -#@ values["kp_default_repository"]["secret"] = {} -#@ values["kp_default_repository"]["secret"]["name"] = data.values.platform.oci_registry.secret.name -#@ values["kp_default_repository"]["secret"]["namespace"] = data.values.platform.oci_registry.secret.namespace -#@ end -#@ end -#@ -#@ return struct.encode(values) -#@ end - ---- -apiVersion: packaging.carvel.dev/v1alpha1 -kind: PackageInstall -metadata: - name: kpack - namespace: #@ data.values.platform.namespace - annotations: - kapp.k14s.io/change-group: kpack - kapp.k14s.io/change-rule.workspace-provisioner: upsert after upserting workspace-provisioner - kapp.k14s.io/change-rule.service-account: delete before deleting serviceaccount -spec: - serviceAccountName: kadras-install-sa - packageRef: - refName: kpack.packages.kadras.io - versionSelection: - constraints: 0.15.0 - prereleases: {} - values: - - secretRef: - name: kpack-values ---- -apiVersion: v1 -kind: Secret -metadata: - name: kpack-values - namespace: #@ data.values.platform.namespace -stringData: - values.yaml: #@ yaml.encode(compute_package_values()) - -#@ end diff --git a/package/config/components/kyverno.yml b/package/config/components/kyverno.yml index 04fe77a..e4b1c17 100644 --- a/package/config/components/kyverno.yml +++ b/package/config/components/kyverno.yml @@ -31,7 +31,7 @@ spec: packageRef: refName: kyverno.packages.kadras.io versionSelection: - constraints: 1.12.5 + constraints: 1.12.6 values: - secretRef: name: kyverno-values diff --git a/package/config/components/postgresql-operator.yml b/package/config/components/postgresql-operator.yml index cd92c30..4fa1f21 100644 --- a/package/config/components/postgresql-operator.yml +++ b/package/config/components/postgresql-operator.yml @@ -24,7 +24,7 @@ spec: packageRef: refName: postgresql-operator.packages.kadras.io versionSelection: - constraints: 1.24.0 + constraints: 1.24.1 values: - secretRef: name: postgresql-operator-values diff --git a/package/config/components/rabbitmq-operator.yml b/package/config/components/rabbitmq-operator.yml index 142a204..6051bab 100644 --- a/package/config/components/rabbitmq-operator.yml +++ b/package/config/components/rabbitmq-operator.yml @@ -24,7 +24,7 @@ spec: packageRef: refName: rabbitmq-operator.packages.kadras.io versionSelection: - constraints: 2.10.0 + constraints: 2.11.0 values: - secretRef: name: rabbitmq-operator-values diff --git a/package/config/components/tekton-pipelines.yml b/package/config/components/tekton-pipelines.yml deleted file mode 100644 index a7f5fb5..0000000 --- a/package/config/components/tekton-pipelines.yml +++ /dev/null @@ -1,47 +0,0 @@ -#@ load("@ytt:data", "data") -#@ load("@ytt:struct", "struct") -#@ load("@ytt:yaml", "yaml") -#@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles") - -#@ if is_package_enabled("tekton-pipelines") and is_any_profile_enabled([profiles.standalone, profiles.build]): - -#@ def compute_package_values(): -#@ values = struct.decode(data.values.tekton.pipelines) -#@ -#@ #! Compute values for CA Certificates -#@ if data.values.platform.ca_cert_data: -#@ values["ca_cert_data"] = values["ca_cert_data"] + data.values.platform.ca_cert_data -#@ end -#@ -#@ return struct.encode(values) -#@ end - ---- -apiVersion: packaging.carvel.dev/v1alpha1 -kind: PackageInstall -metadata: - name: tekton-pipelines - namespace: #@ data.values.platform.namespace - annotations: - kapp.k14s.io/change-group: tekton-pipelines - kapp.k14s.io/change-rule.service-account: delete before deleting serviceaccount -spec: - serviceAccountName: kadras-install-sa - packageRef: - refName: tekton-pipelines.packages.kadras.io - versionSelection: - constraints: 0.53.4 - prereleases: {} - values: - - secretRef: - name: tekton-pipelines-values ---- -apiVersion: v1 -kind: Secret -metadata: - name: tekton-pipelines-values - namespace: #@ data.values.platform.namespace -stringData: - values.yaml: #@ yaml.encode(compute_package_values()) - -#@ end diff --git a/package/config/values-schema.yml b/package/config/values-schema.yml index 5e0ba2a..130d9e3 100644 --- a/package/config/values-schema.yml +++ b/package/config/values-schema.yml @@ -71,15 +71,6 @@ platform: #@schema/desc "The namespace of the Secret holding the credentials to access the Git server." namespace: kadras-system -#@schema/desc "Configuration for Buildpacks related packages." -buildpacks: - #@schema/desc "Configuration for the Buildpacks Catalog package." - #@schema/type any=True - catalog: {} - #@schema/desc "Configuration for the Kpack package." - #@schema/type any=True - kpack: {} - #@schema/desc "Configuration for the Cert Manager package." #@schema/type any=True cert_manager: {} @@ -144,12 +135,6 @@ secretgen_controller: {} #@schema/type any=True service_binding: {} -#@schema/desc "Configuration for Tekton related packages." -tekton: - #@schema/desc "Configuration for the Tekton Pipelines package." - #@schema/type any=True - pipelines: {} - #@schema/desc "Configuration for the Tempo Operator package." #@schema/type any=True tempo_operator: {} diff --git a/test/setup/kind/v1.31/kind-config.yml b/test/setup/kind/v1.31/kind-config.yml index bf28505..b863675 100644 --- a/test/setup/kind/v1.31/kind-config.yml +++ b/test/setup/kind/v1.31/kind-config.yml @@ -3,9 +3,9 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.31.0 + image: kindest/node:v1.31.1 - role: worker - image: kindest/node:v1.31.0 + image: kindest/node:v1.31.1 extraPortMappings: - containerPort: 80 hostPort: 80