From 48e3cb92c85bb9d694406c53c8c31f166041747c Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Sat, 9 Sep 2023 00:11:06 +0200 Subject: [PATCH] Update dependencies to support Kubernetes 1.28 --- .github/ISSUE_TEMPLATE/bug-report.md | 1 + .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 2 +- .gitignore | 1 + Makefile | 23 ++++++++- README.md | 10 ++-- docs/install.md | 4 +- docs/workload.md | 2 +- .../config/components/buildpacks-catalog.yml | 4 +- .../components/cartographer-blueprints.yml | 4 +- .../components/cartographer-delivery.yml | 51 ------------------- .../components/cartographer-supply-chains.yml | 4 +- package/config/components/cartographer.yml | 10 +--- package/config/components/cert-manager.yml | 2 +- package/config/components/contour.yml | 2 +- package/config/components/flux.yml | 14 ++++- package/config/components/knative-serving.yml | 2 +- package/config/components/kpack.yml | 4 +- package/config/components/rbac-configurer.yml | 40 +++++++++++++++ .../components/secretgen-controller.yml | 2 +- .../components/spring-boot-conventions.yml | 4 +- package/config/components/tekton-catalog.yml | 4 +- .../config/components/tekton-pipelines.yml | 4 +- .../components/workspace-provisioner.yml | 2 +- package/config/helpers.star | 2 +- package/config/rbac/deliverable.yml | 10 ---- package/config/rbac/workload.yml | 10 ---- package/config/values-schema.yml | 8 +-- test/integration/run/config/values.yml | 3 -- .../kind/{v1.25 => v1.28}/kind-config.yml | 4 +- 30 files changed, 113 insertions(+), 122 deletions(-) delete mode 100644 package/config/components/cartographer-delivery.yml create mode 100644 package/config/components/rbac-configurer.yml delete mode 100644 package/config/rbac/deliverable.yml delete mode 100644 package/config/rbac/workload.yml rename test/setup/kind/{v1.25 => v1.28}/kind-config.yml (80%) diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md index 596f0bf..d76af27 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ b/.github/ISSUE_TEMPLATE/bug-report.md @@ -24,3 +24,4 @@ assignees: '' * Kubernetes version (execute `kubectl version`): * kctrl version (execute `kctrl version`): * kapp-controller version (execute `kubectl get deployment -n kapp-controller kapp-controller -o yaml` and the annotation is `kbld.k14s.io/images`): +* package version (execute `kctrl package installed get -i engineering-platform -n `): diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b5b00e..01c54da 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.10.0 + version: 0.11.0 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index f178585..8d1717d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: name: Integration Tests strategy: matrix: - k8s_version: [v1.25, v1.26, v1.27] + k8s_version: [v1.26, v1.27, v1.28] permissions: contents: read uses: kadras-io/github-reusable-workflows/.github/workflows/carvel-package-test-integration.yml@main diff --git a/.gitignore b/.gitignore index 2baf84c..2e5d4f5 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ repo/ schema-openapi.yml ### KUTTL ### +test/e2e/ test/integration/kubeconfig test/integration/kuttl-artifacts kubeconfig diff --git a/Makefile b/Makefile index 04dcda4..9f3e4ea 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -K8S_VERSION=v1.27 +K8S_VERSION=v1.28 # Build package configuration build: package @@ -12,8 +12,29 @@ prepare: test/setup # Inner development loop dev: package + kubectl config set-context --current --namespace=tests cd package && kctrl dev -f package-resources.yml --local -y +# Install e2e with 'standalone' profile +e2e-standalone: package + kubectl config set-context --current --namespace=tests + cd package && ytt -f ../test/e2e/standalone -f package-resources.yml | kctrl dev -f- --local -y + +# Install e2e with 'dev' profile +e2e-dev: package + kubectl config set-context --current --namespace=tests + cd package && ytt -f ../test/e2e/dev -f package-resources.yml | kctrl dev -f- --local -y + +# Install e2e with 'build' profile +e2e-build: package + kubectl config set-context --current --namespace=tests + cd package && ytt -f ../test/e2e/build -f package-resources.yml | kctrl dev -f- --local -y + +# Install e2e with 'run' profile +e2e-run: package + kubectl config set-context --current --namespace=tests + cd package && ytt -f ../test/e2e/run -f package-resources.yml | kctrl dev -f- --local -y + # Clean development environment clean: cd package && kctrl dev -f package-resources.yml --local -y --delete diff --git a/README.md b/README.md index db21322..6aeda0f 100644 --- 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.25+ +* Kubernetes 1.26+ * 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`. @@ -77,7 +77,7 @@ The Engineering Platform package can be customized via a `values.yml` file. platform: profile: run ingress: - domain: thomasvitale.com + domain: platform.kadras.io ``` 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. | Config | Default | Description | |-------|-------------------|-------------| -| `platform.profile` | `run` | The platform profile to install. Options: `full`, `dev`, `build`, `run`. | +| `platform.profile` | `run` | The platform profile to install. Options: `standalone`, `dev`, `build`, `run`. | | `platform.supply_chain` | `basic` | The type of supply chain to deploy. Options: `basic`, `advanced`. | | `platform.namespace` | `kadras-packages` | The namespace where to install the platform. | | `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. | `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`. | | `platform.oci_registry.server` | `""` | The server of the OCI Registry where the platform will publish OCI images. Example: "ghcr.io". | | `platform.oci_registry.repository` | `""` | The repository in the OCI Registry where the platform will publish OCI images. Example: "my-org". | -| `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`. | +| `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`. | | `platform.oci_registry.secret.namespace` | `kadras-packages` | The namespace of the Secret holding the credentials to access the OCI registry. | | `platform.cosign.secret.name` | `""` | The name of the Secret holding the Cosign key pair. | | `platform.cosign.secret.namespace` | `kadras-packages` | The namespace of the Secret holding the Cosign key pair. | | `platform.git.server` | `https://github.com` | The server hosting the Git repositories used by the plaform. | -| `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`. | +| `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`. | | `platform.git.secret.namespace` | `kadras-packages` | The namespace of the Secret holding the credentials to access the Git server. | Each Kadras package included in the platform can be configured independently. diff --git a/docs/install.md b/docs/install.md index 11a537c..9c77ff1 100644 --- a/docs/install.md +++ b/docs/install.md @@ -2,7 +2,7 @@ ## 1. Prerequisites -* Kubernetes 1.25+ +* Kubernetes 1.26+ * Carvel [`kctrl`](https://carvel.dev/kapp-controller/docs/latest/install/#installing-kapp-controller-cli-kctrl) CLI. * Sigstore [`cosign`](https://docs.sigstore.dev/cosign/installation/) 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`. @@ -22,7 +22,7 @@ Add the Kadras repository to make all the platform packages available to the clu -n kadras-packages --create-namespace ``` -You can check the full list of available packages as follows. +You can check the standalone list of available packages as follows. ```shell kctrl package available list -n kadras-packages diff --git a/docs/workload.md b/docs/workload.md index 9210bef..f3fd00a 100644 --- a/docs/workload.md +++ b/docs/workload.md @@ -4,5 +4,5 @@ carto apps workload create band-service \ --git-repo https://github.com/ThomasVitale/band-service \ --git-branch main \ - --label "apps.kadras.io/workload-type=web" + --label "app.kadras.io/workload-type=web" ``` diff --git a/package/config/components/buildpacks-catalog.yml b/package/config/components/buildpacks-catalog.yml index 1f3e9a1..003f62a 100644 --- a/package/config/components/buildpacks-catalog.yml +++ b/package/config/components/buildpacks-catalog.yml @@ -3,7 +3,7 @@ #@ 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.full, profiles.dev, profiles.build]): +#@ if is_package_enabled("buildpacks-catalog") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]): #@ def compute_package_values(): #@ values = struct.decode(data.values.buildpacks.catalog) @@ -34,7 +34,7 @@ spec: packageRef: refName: buildpacks-catalog.packages.kadras.io versionSelection: - constraints: 0.9.1 + constraints: 0.9.2 prereleases: {} values: - secretRef: diff --git a/package/config/components/cartographer-blueprints.yml b/package/config/components/cartographer-blueprints.yml index cb59dd9..bdf5c3a 100644 --- a/package/config/components/cartographer-blueprints.yml +++ b/package/config/components/cartographer-blueprints.yml @@ -3,7 +3,7 @@ #@ load("@ytt:yaml", "yaml") #@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles") -#@ if is_package_enabled("cartographer-blueprints") and is_any_profile_enabled([profiles.full, profiles.dev, profiles.build, profiles.run]): +#@ if is_package_enabled("cartographer-blueprints") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]): #@ def compute_package_values(): #@ return data.values.cartographer.blueprints @@ -26,7 +26,7 @@ spec: packageRef: refName: cartographer-blueprints.packages.kadras.io versionSelection: - constraints: 0.6.1 + constraints: 0.7.4 prereleases: {} values: - secretRef: diff --git a/package/config/components/cartographer-delivery.yml b/package/config/components/cartographer-delivery.yml deleted file mode 100644 index a7e6a8f..0000000 --- a/package/config/components/cartographer-delivery.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("cartographer-delivery") and is_any_profile_enabled([profiles.full, profiles.run]): - -#@ def compute_package_values(): -#@ values = struct.decode(data.values.cartographer.delivery) -#@ -#@ #! Compute values for Git server -#@ if data.values.platform.git.server and data.values.platform.git.secret.name and data.values.platform.git.secret.namespace: -#@ if not hasattr(data.values.cartographer.delivery, "git_credentials_secret") or not data.values.cartographer.delivery.git_credentials_secret: -#@ values["git_credentials_secret"] = data.values.platform.git.secret.name -#@ end -#@ end -#@ -#@ return struct.encode(values) -#@ end - ---- -apiVersion: packaging.carvel.dev/v1alpha1 -kind: PackageInstall -metadata: - name: cartographer-delivery - namespace: #@ data.values.platform.namespace - annotations: - kapp.k14s.io/change-group: cartographer-delivery - kapp.k14s.io/change-rule.cartographer: upsert after upserting cartographer - kapp.k14s.io/change-rule.cartographer-blueprints: upsert after upserting cartographer-blueprints - kapp.k14s.io/change-rule.service-account: delete before deleting serviceaccount -spec: - serviceAccountName: kadras-install-sa - packageRef: - refName: cartographer-delivery.packages.kadras.io - versionSelection: - constraints: 0.5.0 - prereleases: {} - values: - - secretRef: - name: cartographer-delivery-values ---- -apiVersion: v1 -kind: Secret -metadata: - name: cartographer-delivery-values - namespace: #@ data.values.platform.namespace -stringData: - values.yaml: #@ yaml.encode(compute_package_values()) - -#@ end diff --git a/package/config/components/cartographer-supply-chains.yml b/package/config/components/cartographer-supply-chains.yml index 3454b41..23adfc8 100644 --- a/package/config/components/cartographer-supply-chains.yml +++ b/package/config/components/cartographer-supply-chains.yml @@ -3,7 +3,7 @@ #@ load("@ytt:yaml", "yaml") #@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles") -#@ if is_package_enabled("cartographer-supply-chains") and is_any_profile_enabled([profiles.full, profiles.dev, profiles.build]): +#@ if is_package_enabled("cartographer-supply-chains") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]): #@ def compute_package_values(): #@ values = struct.decode(data.values.cartographer.supply_chains) @@ -55,7 +55,7 @@ spec: packageRef: refName: cartographer-supply-chains.packages.kadras.io versionSelection: - constraints: 0.6.0 + constraints: 0.7.2 prereleases: {} values: - secretRef: diff --git a/package/config/components/cartographer.yml b/package/config/components/cartographer.yml index d814963..a83cf04 100644 --- a/package/config/components/cartographer.yml +++ b/package/config/components/cartographer.yml @@ -3,7 +3,7 @@ #@ load("@ytt:yaml", "yaml") #@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles") -#@ if is_package_enabled("cartographer") and is_any_profile_enabled([profiles.full, profiles.dev, profiles.build, profiles.run]): +#@ if is_package_enabled("cartographer") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]): #@ def compute_package_values(): #@ values = struct.decode(data.values.cartographer.core) @@ -13,14 +13,6 @@ #@ values["ca_cert_data"] = values["ca_cert_data"] + data.values.platform.ca_cert_data #@ end #@ -#@ #! Disable Cartographer Conventions based on profile -#@ if is_any_profile_enabled([profiles.run]): -#@ if not hasattr(data.values.cartographer.core, "optional_components") or not data.values.cartographer.core.optional_components or not hasattr(data.values.cartographer.core.optional_components, "cartographer_conventions") or not data.values.cartographer.core.optional_components.cartographer_conventions: -#@ values["optional_components"] = {} -#@ values["optional_components"]["cartographer_conventions"] = "false" -#@ end -#@ end -#@ #@ return struct.encode(values) #@ end diff --git a/package/config/components/cert-manager.yml b/package/config/components/cert-manager.yml index 706934a..8ae98cb 100644 --- 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.12.3 + constraints: 1.12.4+kadras.1 prereleases: {} values: - secretRef: diff --git a/package/config/components/contour.yml b/package/config/components/contour.yml index 1434b2b..b4c8058 100644 --- 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.25.2 + constraints: 1.26.0 values: - secretRef: name: contour-values diff --git a/package/config/components/flux.yml b/package/config/components/flux.yml index 2e8222d..28ae023 100644 --- a/package/config/components/flux.yml +++ b/package/config/components/flux.yml @@ -6,7 +6,17 @@ #@ if is_package_enabled("flux"): #@ def compute_package_values(): -#@ return data.values.flux +#@ values = struct.decode(data.values.flux) +#@ +#@ #! Disable Kustomize Controller based on profile +#@ if is_any_profile_enabled([profiles.dev]): +#@ if not hasattr(data.values.flux, "optional_components") or not data.values.flux.optional_components or not hasattr(data.values.flux.optional_components, "kustomize_controller") or not data.values.flux.optional_components.kustomize_controller: +#@ values["optional_components"] = {} +#@ values["optional_components"]["kustomize_controller"] = False +#@ end +#@ end +#@ +#@ return struct.encode(values) #@ end --- @@ -23,7 +33,7 @@ spec: packageRef: refName: flux.packages.kadras.io versionSelection: - constraints: 2.1.0+kadras.1 + constraints: 2.1.0+kadras.2 values: - secretRef: name: flux-values diff --git a/package/config/components/knative-serving.yml b/package/config/components/knative-serving.yml index 205a61c..22ec1e6 100644 --- a/package/config/components/knative-serving.yml +++ b/package/config/components/knative-serving.yml @@ -3,7 +3,7 @@ #@ load("@ytt:yaml", "yaml") #@ load("/helpers.star", "get_issuer_name", "is_any_profile_enabled", "is_package_enabled", "profiles") -#@ if is_package_enabled("knative-serving") and is_any_profile_enabled([profiles.full, profiles.dev, profiles.run]): +#@ if is_package_enabled("knative-serving") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.run]): #@ def compute_package_values(): #@ values = struct.decode(data.values.knative.serving) diff --git a/package/config/components/kpack.yml b/package/config/components/kpack.yml index 4b9cd88..1f27220 100644 --- a/package/config/components/kpack.yml +++ b/package/config/components/kpack.yml @@ -3,7 +3,7 @@ #@ 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.full, profiles.dev, profiles.build]): +#@ if is_package_enabled("kpack") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]): #@ def compute_package_values(): #@ values = { @@ -54,7 +54,7 @@ spec: packageRef: refName: kpack.packages.kadras.io versionSelection: - constraints: 0.11.2+kadras.1 + constraints: 0.12.0 prereleases: {} values: - secretRef: diff --git a/package/config/components/rbac-configurer.yml b/package/config/components/rbac-configurer.yml new file mode 100644 index 0000000..bef88aa --- /dev/null +++ b/package/config/components/rbac-configurer.yml @@ -0,0 +1,40 @@ +#@ 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("rbac-configurer"): + +#@ def compute_package_values(): +#@ return data.values.metrics_server +#@ end + +--- +apiVersion: packaging.carvel.dev/v1alpha1 +kind: PackageInstall +metadata: + name: rbac-configurer + namespace: #@ data.values.platform.namespace + annotations: + kapp.k14s.io/change-group: rbac-configurer + kapp.k14s.io/change-rule.service-account: delete before deleting serviceaccount +spec: + serviceAccountName: kadras-install-sa + packageRef: + refName: rbac-configurer.packages.kadras.io + versionSelection: + constraints: 0.2.1 + prereleases: {} + values: + - secretRef: + name: rbac-configurer-values +--- +apiVersion: v1 +kind: Secret +metadata: + name: rbac-configurer-values + namespace: #@ data.values.platform.namespace +stringData: + values.yaml: #@ yaml.encode(compute_package_values()) + +#@ end diff --git a/package/config/components/secretgen-controller.yml b/package/config/components/secretgen-controller.yml index 509fb77..7a3ea9c 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.14.8 + constraints: 0.14.10 prereleases: {} values: - secretRef: diff --git a/package/config/components/spring-boot-conventions.yml b/package/config/components/spring-boot-conventions.yml index 5b53bfe..a9c74b6 100644 --- a/package/config/components/spring-boot-conventions.yml +++ b/package/config/components/spring-boot-conventions.yml @@ -3,7 +3,7 @@ #@ load("@ytt:yaml", "yaml") #@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles") -#@ if is_package_enabled("spring-boot-conventions") and is_any_profile_enabled([profiles.full, profiles.dev, profiles.build]): +#@ if is_package_enabled("spring-boot-conventions") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]): #@ def compute_package_values(): #@ return data.values.conventions.spring_boot @@ -24,7 +24,7 @@ spec: packageRef: refName: spring-boot-conventions.packages.kadras.io versionSelection: - constraints: 0.3.0 + constraints: 0.3.1 values: - secretRef: name: spring-boot-conventions-values diff --git a/package/config/components/tekton-catalog.yml b/package/config/components/tekton-catalog.yml index 2505ba1..ca2b8f5 100644 --- a/package/config/components/tekton-catalog.yml +++ b/package/config/components/tekton-catalog.yml @@ -3,7 +3,7 @@ #@ load("@ytt:yaml", "yaml") #@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles") -#@ if is_package_enabled("tekton-catalog") and is_any_profile_enabled([profiles.full, profiles.dev, profiles.build]): +#@ if is_package_enabled("tekton-catalog") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]): #@ def compute_package_values(): #@ return data.values.tekton.catalog @@ -24,7 +24,7 @@ spec: packageRef: refName: tekton-catalog.packages.kadras.io versionSelection: - constraints: 0.2.1 + constraints: 0.2.2 prereleases: {} values: - secretRef: diff --git a/package/config/components/tekton-pipelines.yml b/package/config/components/tekton-pipelines.yml index 8e28972..aaa875b 100644 --- a/package/config/components/tekton-pipelines.yml +++ b/package/config/components/tekton-pipelines.yml @@ -3,7 +3,7 @@ #@ 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.full, profiles.dev, profiles.build]): +#@ if is_package_enabled("tekton-pipelines") and is_any_profile_enabled([profiles.standalone, profiles.dev, profiles.build]): #@ def compute_package_values(): #@ values = struct.decode(data.values.tekton.pipelines) @@ -30,7 +30,7 @@ spec: packageRef: refName: tekton-pipelines.packages.kadras.io versionSelection: - constraints: 0.49.0 + constraints: 0.51.0 prereleases: {} values: - secretRef: diff --git a/package/config/components/workspace-provisioner.yml b/package/config/components/workspace-provisioner.yml index 34a45de..9003160 100644 --- a/package/config/components/workspace-provisioner.yml +++ b/package/config/components/workspace-provisioner.yml @@ -62,7 +62,7 @@ spec: packageRef: refName: workspace-provisioner.packages.kadras.io versionSelection: - constraints: 0.2.1 + constraints: 0.3.0 values: - secretRef: name: workspace-provisioner-values diff --git a/package/config/helpers.star b/package/config/helpers.star index cb35235..8c91e9c 100644 --- a/package/config/helpers.star +++ b/package/config/helpers.star @@ -2,7 +2,7 @@ load("@ytt:data", "data") load("@ytt:struct", "struct") profiles = struct.make( - full="full", + standalone="standalone", dev="dev", build="build", run="run" diff --git a/package/config/rbac/deliverable.yml b/package/config/rbac/deliverable.yml deleted file mode 100644 index d3d06f1..0000000 --- a/package/config/rbac/deliverable.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: deliverable -aggregationRule: - clusterRoleSelectors: - - matchLabels: - apps.kadras.io/aggregate-to-deliverable: "true" -rules: [] diff --git a/package/config/rbac/workload.yml b/package/config/rbac/workload.yml deleted file mode 100644 index 83d0156..0000000 --- a/package/config/rbac/workload.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -apiVersion: rbac.authorization.k8s.io/v1 -kind: ClusterRole -metadata: - name: workload -aggregationRule: - clusterRoleSelectors: - - matchLabels: - apps.kadras.io/aggregate-to-workload: "true" -rules: [] diff --git a/package/config/values-schema.yml b/package/config/values-schema.yml index d15c1d1..1098b50 100644 --- a/package/config/values-schema.yml +++ b/package/config/values-schema.yml @@ -4,8 +4,8 @@ #@schema/desc "Configuration for the platform packages." platform: - #@schema/desc "The platform profile to install. Options: `full`, `dev`, `build`, `run`." - #@schema/validation one_of=["full", "dev", "build", "run"] + #@schema/desc "The platform profile to install. Options: `standalone`, `dev`, `build`, `run`." + #@schema/validation one_of=["standalone", "dev", "build", "run"] profile: run #@schema/desc "The type of supply chain to deploy. Options: `basic`, `advanced`." #@schema/validation one_of=["basic", "advanced"] @@ -50,7 +50,7 @@ platform: repository: "" #@schema/desc "Configuration for the Secret holding the credentials to access the OCI registry." secret: - #@schema/desc "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`." + #@schema/desc "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`." name: "" #@schema/desc "The namespace of the Secret holding the credentials to access the OCI registry." namespace: kadras-packages @@ -71,7 +71,7 @@ platform: server: https://github.com #@schema/desc "Configuration for the Secret holding the credentials to access the Git server." secret: - #@schema/desc "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`." + #@schema/desc "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`." name: "" #@schema/desc "The namespace of the Secret holding the credentials to access the Git server." namespace: kadras-packages diff --git a/test/integration/run/config/values.yml b/test/integration/run/config/values.yml index f55b76c..930419b 100644 --- a/test/integration/run/config/values.yml +++ b/test/integration/run/config/values.yml @@ -12,8 +12,5 @@ stringData: ingress: domain: 127.0.0.1.sslip.io excluded_packages: - - cartographer-blueprints - - cartographer-delivery - - cartographer - flux - kyverno diff --git a/test/setup/kind/v1.25/kind-config.yml b/test/setup/kind/v1.28/kind-config.yml similarity index 80% rename from test/setup/kind/v1.25/kind-config.yml rename to test/setup/kind/v1.28/kind-config.yml index c987572..35fff4a 100644 --- a/test/setup/kind/v1.25/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.25.11 + image: kindest/node:v1.28.0 - role: worker - image: kindest/node:v1.25.11 + image: kindest/node:v1.28.0 extraPortMappings: - containerPort: 80 hostPort: 80