From 6318a479ee49c9a68e42494d11a03e1dd8976489 Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Mon, 23 Sep 2024 23:55:29 +0200 Subject: [PATCH] feat: Add Dependency Track and bump packages --- .github/workflows/release.yml | 2 +- README.md | 1 + docs/quick-start/getting-started.md | 4 +- .../config/components/buildpacks-catalog.yml | 2 +- package/config/components/crossplane.yml | 2 +- package/config/components/dapr.yml | 2 +- .../config/components/dependency-track.yml | 44 +++++++++++++++++++ .../config/components/developer-portal.yml | 2 +- .../config/components/rabbitmq-operator.yml | 2 +- .../components/secretgen-controller.yml | 2 +- package/config/values-schema.yml | 4 ++ 11 files changed, 58 insertions(+), 9 deletions(-) create mode 100644 package/config/components/dependency-track.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9eeebf2..69b3f15 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.19.1 + version: 0.20.0 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }} diff --git a/README.md b/README.md index 8d29be1..a705e28 100644 --- a/README.md +++ b/README.md @@ -127,6 +127,7 @@ Each Kadras package included in the platform can be configured independently. | `contour` | `{}` | Configuration for the Contour package. | | `crossplane` | `{}` | Configuration for the Crossplane package. | | `dapr` | `{}` | Configuration for the Dapr package. | +| `dependency-track` | `{}` | Configuration for the Dependency Track package. | | `developer_portal` | `{}` | Configuration for the Developer Portal package. | | `flux` | `{}` | Configuration for the Flux package. | | `gitops_configurer` | `{}` | Configuration for the GitOps Configurer package. | diff --git a/docs/quick-start/getting-started.md b/docs/quick-start/getting-started.md index f8acdb7..2ecd66e 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.21.0 \ + --url ghcr.io/kadras-io/kadras-packages:0.22.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.19.0 \ + -v 0.20.0 \ -n kadras-system \ --values-file values.yml ``` diff --git a/package/config/components/buildpacks-catalog.yml b/package/config/components/buildpacks-catalog.yml index 79401e5..7f002a9 100644 --- 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.12.2 + constraints: 0.12.3 prereleases: {} values: - secretRef: diff --git a/package/config/components/crossplane.yml b/package/config/components/crossplane.yml index 77be9cd..ad98c49 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.0 + constraints: 1.17.1 values: - secretRef: name: crossplane-values diff --git a/package/config/components/dapr.yml b/package/config/components/dapr.yml index 159dae0..4dd91cf 100644 --- a/package/config/components/dapr.yml +++ b/package/config/components/dapr.yml @@ -25,7 +25,7 @@ spec: packageRef: refName: dapr.packages.kadras.io versionSelection: - constraints: 1.14.1 + constraints: 1.14.4 values: - secretRef: name: dapr-values diff --git a/package/config/components/dependency-track.yml b/package/config/components/dependency-track.yml new file mode 100644 index 0000000..bf21989 --- /dev/null +++ b/package/config/components/dependency-track.yml @@ -0,0 +1,44 @@ +#@ load("@ytt:data", "data") +#@ load("@ytt:struct", "struct") +#@ load("@ytt:yaml", "yaml") +#@ load("/helpers.star", "is_package_additional") + +#@ if is_package_additional("dependency-track"): + +#@ def compute_package_values(): +#@ values = struct.decode(data.values.dependency_track) +#@ return struct.encode(values) +#@ end + +--- +apiVersion: packaging.carvel.dev/v1alpha1 +kind: PackageInstall +metadata: + name: dependency-track + namespace: #@ data.values.platform.namespace + annotations: + kapp.k14s.io/change-group: dependency-track + 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.postgresql-operator: upsert after upserting postgresql-operator + kapp.k14s.io/change-rule.secretgen-controller: upsert after upserting secretgen-controller + kapp.k14s.io/change-rule.serviceaccount: delete before deleting serviceaccount +spec: + serviceAccountName: kadras-install-sa + packageRef: + refName: dependency-track.packages.kadras.io + versionSelection: + constraints: 4.11.7 + values: + - secretRef: + name: dependency-track-values +--- +apiVersion: v1 +kind: Secret +metadata: + name: dependency-track-values + namespace: #@ data.values.platform.namespace +stringData: + values.yaml: #@ yaml.encode(compute_package_values()) + +#@ end \ No newline at end of file diff --git a/package/config/components/developer-portal.yml b/package/config/components/developer-portal.yml index bf77f47..d60080b 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.2.0 + constraints: 0.2.1 values: - secretRef: name: developer-portal-values diff --git a/package/config/components/rabbitmq-operator.yml b/package/config/components/rabbitmq-operator.yml index 31b7f0a..142a204 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.9.0 + constraints: 2.10.0 values: - secretRef: name: rabbitmq-operator-values diff --git a/package/config/components/secretgen-controller.yml b/package/config/components/secretgen-controller.yml index bcc9fd6..ddefdeb 100644 --- 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.18.0 + constraints: 0.18.1 prereleases: {} values: - secretRef: diff --git a/package/config/values-schema.yml b/package/config/values-schema.yml index 848b0da..5e0ba2a 100644 --- a/package/config/values-schema.yml +++ b/package/config/values-schema.yml @@ -96,6 +96,10 @@ crossplane: {} #@schema/type any=True dapr: {} +#@schema/desc "Configuration for the Dependency Track package." +#@schema/type any=True +dependency_track: {} + #@schema/desc "Configuration for the Developer Portal package." #@schema/type any=True developer_portal: {}