diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba0e337..0d50f6f 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-RC3 + version: 0.10.0-RC4 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }} diff --git a/README.md b/README.md index 06260cd..e816498 100644 --- a/README.md +++ b/README.md @@ -99,6 +99,7 @@ The Engineering Platform package has the following configurable properties. | Config | Default | Description | |-------|-------------------|-------------| | `platform.profile` | `full` | The platform profile to install. Options: `full`, `serving`. | +| `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. | | `platform.ca_cert_data` | `""` | PEM-encoded certificate data to trust TLS connections with a custom CA. | diff --git a/docs/install.md b/docs/install.md index a73c54a..11a537c 100644 --- a/docs/install.md +++ b/docs/install.md @@ -74,8 +74,9 @@ Then, create a Secret with the credentials to access your Git server in read/wri ```shell kubectl create secret generic supply-chain-git-credentials \ - --from-literal=username"${SUPPLY_CHAIN_REGISTRY_USERNAME}" \ - --from-literal=password="${SUPPLY_CHAIN_REGISTRY_TOKEN}" \ + --type=kubernetes.io/basic-auth \ + --from-literal=username="${SUPPLY_CHAIN_GIT_USERNAME}" \ + --from-literal=password="${SUPPLY_CHAIN_GIT_TOKEN}" \ --namespace=kadras-packages ``` diff --git a/package/config/buildpacks-catalog.yml b/package/config/buildpacks-catalog.yml index 59e87f0..7137347 100644 --- a/package/config/buildpacks-catalog.yml +++ b/package/config/buildpacks-catalog.yml @@ -34,7 +34,7 @@ spec: packageRef: refName: buildpacks-catalog.packages.kadras.io versionSelection: - constraints: 0.8.0 + constraints: 0.9.1 prereleases: {} values: - secretRef: diff --git a/package/config/cartographer-blueprints.yml b/package/config/cartographer-blueprints.yml index e56c72f..8074fc0 100644 --- a/package/config/cartographer-blueprints.yml +++ b/package/config/cartographer-blueprints.yml @@ -26,7 +26,7 @@ spec: packageRef: refName: cartographer-blueprints.packages.kadras.io versionSelection: - constraints: 0.5.1 + constraints: 0.6.1 prereleases: {} values: - secretRef: diff --git a/package/config/cartographer-delivery.yml b/package/config/cartographer-delivery.yml index 898d0bb..5df9203 100644 --- a/package/config/cartographer-delivery.yml +++ b/package/config/cartographer-delivery.yml @@ -6,7 +6,18 @@ #@ if is_package_enabled("cartographer-delivery") and is_any_profile_enabled([profiles.full]): #@ def compute_package_values(): -#@ return data.values.cartographer.delivery +#@ values = struct.decode(data.values.cartographer.delivery) +#@ +#@ #! Compute values for Git server +#@ if is_any_profile_enabled([profiles.full]): +#@ 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 +#@ end +#@ +#@ return struct.encode(values) #@ end --- @@ -25,7 +36,7 @@ spec: packageRef: refName: cartographer-delivery.packages.kadras.io versionSelection: - constraints: 0.4.1 + constraints: 0.5.0 prereleases: {} values: - secretRef: diff --git a/package/config/cartographer-supply-chains.yml b/package/config/cartographer-supply-chains.yml index a9c5647..f85237f 100644 --- a/package/config/cartographer-supply-chains.yml +++ b/package/config/cartographer-supply-chains.yml @@ -8,6 +8,18 @@ #@ def compute_package_values(): #@ values = struct.decode(data.values.cartographer.supply_chains) #@ +#@ #! 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 Supply Chain +#@ if data.values.platform.supply_chain: +#@ if not hasattr(data.values.cartographer.supply_chains, "supply_chain") or not data.values.cartographer.supply_chains.supply_chain: +#@ values["supply_chain"] = data.values.platform.supply_chain +#@ end +#@ 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.cartographer.supply_chains, "registry") or not hasattr(data.values.cartographer.supply_chains.registry, "server") or not hasattr(data.values.cartographer.supply_chains.registry, "repository") or not data.values.cartographer.supply_chains.registry.server or not data.values.cartographer.supply_chains.registry.repository: @@ -17,6 +29,15 @@ #@ end #@ end #@ +#@ #! Compute values for Git server +#@ if is_any_profile_enabled([profiles.full]): +#@ 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.supply_chains, "git_credentials_secret") or not data.values.cartographer.supply_chains.git_credentials_secret: +#@ values["git_credentials_secret"] = data.values.platform.git.secret.name +#@ end +#@ end +#@ end +#@ #@ return struct.encode(values) #@ end @@ -36,7 +57,7 @@ spec: packageRef: refName: cartographer-supply-chains.packages.kadras.io versionSelection: - constraints: 0.5.1 + constraints: 0.6.0 prereleases: {} values: - secretRef: diff --git a/package/config/cartographer.yml b/package/config/cartographer.yml index 0806e64..7e95dcb 100644 --- a/package/config/cartographer.yml +++ b/package/config/cartographer.yml @@ -31,7 +31,7 @@ spec: packageRef: refName: cartographer.packages.kadras.io versionSelection: - constraints: 0.7.1+tap.1 + constraints: 0.7.3 prereleases: {} values: - secretRef: diff --git a/package/config/cert-manager-issuers.yml b/package/config/cert-manager-issuers.yml index 438300d..6cfc787 100644 --- a/package/config/cert-manager-issuers.yml +++ b/package/config/cert-manager-issuers.yml @@ -47,7 +47,7 @@ spec: packageRef: refName: cert-manager-issuers.packages.kadras.io versionSelection: - constraints: 0.2.1 + constraints: 0.2.2 prereleases: {} values: - secretRef: diff --git a/package/config/cert-manager.yml b/package/config/cert-manager.yml index d68671d..4ffefb4 100644 --- a/package/config/cert-manager.yml +++ b/package/config/cert-manager.yml @@ -23,7 +23,7 @@ spec: packageRef: refName: cert-manager.packages.kadras.io versionSelection: - constraints: 1.12.2 + constraints: 1.12.3 prereleases: {} values: - secretRef: diff --git a/package/config/contour.yml b/package/config/contour.yml index 5de61e1..9dab085 100644 --- a/package/config/contour.yml +++ b/package/config/contour.yml @@ -37,7 +37,7 @@ spec: packageRef: refName: contour.packages.kadras.io versionSelection: - constraints: 1.25.0+kadras.3 + constraints: 1.25.2 values: - secretRef: name: contour-values diff --git a/package/config/fluxcd-source.controller.yml b/package/config/fluxcd-source.controller.yml index 6e556d0..bdec9f7 100644 --- a/package/config/fluxcd-source.controller.yml +++ b/package/config/fluxcd-source.controller.yml @@ -23,7 +23,7 @@ spec: packageRef: refName: fluxcd-source-controller.packages.kadras.io versionSelection: - constraints: 0.36.1 + constraints: 1.0.1+kadras.1 values: - secretRef: name: fluxcd-source-controller-values diff --git a/package/config/knative-serving.yml b/package/config/knative-serving.yml index 8bcb4dc..d920e28 100644 --- a/package/config/knative-serving.yml +++ b/package/config/knative-serving.yml @@ -42,7 +42,7 @@ spec: packageRef: refName: knative-serving.packages.kadras.io versionSelection: - constraints: 1.10.2+kadras.1 + constraints: 1.11.0 values: - secretRef: name: knative-serving-values diff --git a/package/config/kpack.yml b/package/config/kpack.yml index 39b90f2..fbd56df 100644 --- a/package/config/kpack.yml +++ b/package/config/kpack.yml @@ -54,7 +54,7 @@ spec: packageRef: refName: kpack.packages.kadras.io versionSelection: - constraints: 0.11.1 + constraints: 0.11.2+kadras.1 prereleases: {} values: - secretRef: diff --git a/package/config/metrics-server.yml b/package/config/metrics-server.yml index 98808c8..ae87bb1 100644 --- a/package/config/metrics-server.yml +++ b/package/config/metrics-server.yml @@ -23,7 +23,7 @@ spec: packageRef: refName: metrics-server.packages.kadras.io versionSelection: - constraints: 0.6.3 + constraints: 0.6.4 prereleases: {} values: - secretRef: diff --git a/package/config/secretgen-controller.yml b/package/config/secretgen-controller.yml index ac94699..d2a6fef 100644 --- a/package/config/secretgen-controller.yml +++ b/package/config/secretgen-controller.yml @@ -3,7 +3,7 @@ #@ load("@ytt:yaml", "yaml") #@ load("/helpers.star", "is_any_profile_enabled", "is_package_enabled", "profiles") -#@ if is_package_enabled("secretgen-controller") and is_any_profile_enabled([profiles.serving]): +#@ if is_package_enabled("secretgen-controller") and is_any_profile_enabled([profiles.full, profiles.serving]): #@ def compute_package_values(): #@ return data.values.secretgen_controller diff --git a/package/config/spring-boot-conventions.yml b/package/config/spring-boot-conventions.yml index ac83708..ddbd6cc 100644 --- a/package/config/spring-boot-conventions.yml +++ b/package/config/spring-boot-conventions.yml @@ -24,7 +24,7 @@ spec: packageRef: refName: spring-boot-conventions.packages.kadras.io versionSelection: - constraints: 0.2.1 + constraints: 0.3.0 values: - secretRef: name: spring-boot-conventions-values diff --git a/package/config/tekton-catalog.yml b/package/config/tekton-catalog.yml index 4a54d84..a49fd64 100644 --- a/package/config/tekton-catalog.yml +++ b/package/config/tekton-catalog.yml @@ -24,7 +24,7 @@ spec: packageRef: refName: tekton-catalog.packages.kadras.io versionSelection: - constraints: 0.1.1 + constraints: 0.2.1 prereleases: {} values: - secretRef: diff --git a/package/config/tekton-pipelines.yml b/package/config/tekton-pipelines.yml index 669eec9..af5d9a8 100644 --- a/package/config/tekton-pipelines.yml +++ b/package/config/tekton-pipelines.yml @@ -30,7 +30,7 @@ spec: packageRef: refName: tekton-pipelines.packages.kadras.io versionSelection: - constraints: 0.46.0+kadras.2 + constraints: 0.49.0 prereleases: {} values: - secretRef: diff --git a/package/config/values-schema.yml b/package/config/values-schema.yml index 42781c6..0e213bc 100644 --- a/package/config/values-schema.yml +++ b/package/config/values-schema.yml @@ -7,6 +7,9 @@ platform: #@schema/desc "The platform profile to install. Options: `full`, `serving`." #@schema/validation one_of=["full", "serving"] profile: full + #@schema/desc "The type of supply chain to deploy. Options: `basic`, `advanced`." + #@schema/validation one_of=["basic", "advanced"] + supply_chain: basic #@schema/desc "The namespace where to install the platform." namespace: kadras-packages #@schema/desc "A list of packages to exclude from being installed." diff --git a/package/config/workspace-provisioner.yml b/package/config/workspace-provisioner.yml index de564f1..22a4e8e 100644 --- a/package/config/workspace-provisioner.yml +++ b/package/config/workspace-provisioner.yml @@ -68,7 +68,7 @@ spec: packageRef: refName: workspace-provisioner.packages.kadras.io versionSelection: - constraints: 0.2.0 + constraints: 0.2.1 values: - secretRef: name: workspace-provisioner-values