diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 140b13f..9231e7f 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.25.0 + version: 0.26.0 secrets: pull-request-token: ${{ secrets.GH_ORG_PAT }} diff --git a/README.md b/README.md index 2cc32b7..15f9f48 100644 --- a/README.md +++ b/README.md @@ -107,8 +107,6 @@ The Engineering Platform package has the following configurable properties. | `platform.ingress.issuer.type` | `private` | The type of ClusterIssuer the platform will use to enable TLS communications. Options: `private`, `letsencrypt_staging`, `letsencrypt`, `custom`. | | `platform.ingress.issuer.name` | `""` | A reference to a custom ClusterIssuer previously created on the cluster where the platform will be installed. Required when the type is `custom`. | | `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: `standalone`, `dev`, `build`. | | `platform.oci_registry.secret.namespace` | `kadras-system` | 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. | @@ -124,7 +122,6 @@ Each Kadras package included in the platform can be configured independently. | `cert_manager` | `{}` | Configuration for the Cert Manager package. | | `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. | diff --git a/package/config/components/cert-manager.yml b/package/config/components/cert-manager.yml index 4539d94..11df0f1 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.17.2 + constraints: 1.18.2 prereleases: {} values: - secretRef: diff --git a/package/config/components/crossplane.yml b/package/config/components/crossplane.yml index c3054e4..63c571f 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.20.0 + constraints: 2.0.2 values: - secretRef: name: crossplane-values diff --git a/package/config/components/dapr.yml b/package/config/components/dapr.yml deleted file mode 100644 index decac6b..0000000 --- a/package/config/components/dapr.yml +++ /dev/null @@ -1,41 +0,0 @@ -#@ 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.15.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 \ No newline at end of file diff --git a/package/config/components/dependency-track.yml b/package/config/components/dependency-track.yml index edf363f..03c6b07 100644 --- a/package/config/components/dependency-track.yml +++ b/package/config/components/dependency-track.yml @@ -39,7 +39,7 @@ spec: packageRef: refName: dependency-track.packages.kadras.io versionSelection: - constraints: 4.13.2 + constraints: 4.13.3 values: - secretRef: name: dependency-track-values diff --git a/package/config/components/flux.yml b/package/config/components/flux.yml index c17076f..d33dfad 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.6.0 + constraints: 2.6.4 values: - secretRef: name: flux-values diff --git a/package/config/components/knative-serving.yml b/package/config/components/knative-serving.yml index 85311d7..a01d1ee 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.18.0 + constraints: 1.19.0 values: - secretRef: name: knative-serving-values diff --git a/package/config/components/kyverno.yml b/package/config/components/kyverno.yml index 9a110aa..67f3415 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.14.1 + constraints: 1.15.0 values: - secretRef: name: kyverno-values diff --git a/package/config/components/metrics-server.yml b/package/config/components/metrics-server.yml index f73edc0..ab133d1 100644 --- 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.7.2 + constraints: 0.8.0 prereleases: {} values: - secretRef: diff --git a/package/config/components/postgresql-operator.yml b/package/config/components/postgresql-operator.yml index 2a46af4..10cd7a0 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.26.0 + constraints: 1.27.0 values: - secretRef: name: postgresql-operator-values diff --git a/package/config/components/rabbitmq-operator.yml b/package/config/components/rabbitmq-operator.yml index b35c35d..98cce72 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.13.0 + constraints: 2.16.0 values: - secretRef: name: rabbitmq-operator-values diff --git a/package/config/components/tempo-operator.yml b/package/config/components/tempo-operator.yml index 069144b..0e789b6 100644 --- a/package/config/components/tempo-operator.yml +++ b/package/config/components/tempo-operator.yml @@ -26,7 +26,7 @@ spec: packageRef: refName: tempo-operator.packages.kadras.io versionSelection: - constraints: 0.15.3 + constraints: 0.17.1 values: - secretRef: name: tempo-operator-values diff --git a/package/config/components/workspace-provisioner.yml b/package/config/components/workspace-provisioner.yml index 9003160..392d70b 100644 --- a/package/config/components/workspace-provisioner.yml +++ b/package/config/components/workspace-provisioner.yml @@ -9,12 +9,12 @@ #@ values = struct.decode(data.values.workspace_provisioner) #@ #@ #! Compute values for OCI Registry server -#@ if data.values.platform.oci_registry.secret.name and data.values.platform.oci_registry.secret.namespace: -#@ if not hasattr(data.values.workspace_provisioner, "oci_registry") or not hasattr(data.values.workspace_provisioner.oci_registry, "secret") or not hasattr(data.values.workspace_provisioner.oci_registry.secret, "name") or not hasattr(data.values.workspace_provisioner.oci_registry.secret, "namespace") or not data.values.workspace_provisioner.oci_registry.secret.name or not data.values.workspace_provisioner.oci_registry.secret.namespace: -#@ values["oci_registry"] = {} -#@ values["oci_registry"]["secret"] = {} -#@ values["oci_registry"]["secret"]["name"] = data.values.platform.oci_registry.secret.name -#@ values["oci_registry"]["secret"]["namespace"] = data.values.platform.oci_registry.secret.namespace +#@ if data.values.platform.oci.pull_secret.name and data.values.platform.oci.pull_secret.namespace: +#@ if not hasattr(data.values.workspace_provisioner, "oci") or not hasattr(data.values.workspace_provisioner.oci, "pull_secret") or not hasattr(data.values.workspace_provisioner.oci.pull_secret, "name") or not hasattr(data.values.workspace_provisioner.oci.pull_secret, "namespace") or not data.values.workspace_provisioner.oci.pull_secret.name or not data.values.workspace_provisioner.oci.pull_secret.namespace: +#@ values["oci"] = {} +#@ values["oci"]["pull_secret"] = {} +#@ values["oci"]["pull_secret"]["name"] = data.values.platform.oci.pull_secret.name +#@ values["oci"]["pull_secret"]["namespace"] = data.values.platform.oci.pull_secret.namespace #@ end #@ end #@ @@ -62,7 +62,7 @@ spec: packageRef: refName: workspace-provisioner.packages.kadras.io versionSelection: - constraints: 0.3.0 + constraints: 0.4.0 values: - secretRef: name: workspace-provisioner-values diff --git a/package/config/helpers.star b/package/config/helpers.star index 7bfb9e0..42d313d 100644 --- a/package/config/helpers.star +++ b/package/config/helpers.star @@ -3,7 +3,6 @@ load("@ytt:struct", "struct") profiles = struct.make( standalone="standalone", - build="build", run="run" ) diff --git a/package/config/values-schema.yml b/package/config/values-schema.yml index 130d9e3..54e3c8d 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: `standalone`, `build`, `run`." - #@schema/validation one_of=["standalone", "build", "run"] + #@schema/desc "The platform profile to install. Options: `standalone`, `run`." + #@schema/validation one_of=["standalone", "run"] profile: run #@schema/desc "The namespace where to install the platform." namespace: kadras-system @@ -35,19 +35,13 @@ platform: #@schema/validation when=lambda _, ctx: ctx.parent["type"] == "letsencrypt_staging" or ctx.parent["type"] == "letsencrypt" email: "" - #@schema/desc "Settings for the OCI registry that the platform will use." - oci_registry: - #@schema/desc "The server of the OCI Registry where the platform will publish OCI images." - #@schema/examples ("GitHub Container Registry", "ghcr.io") - server: "" - #@schema/desc "The repository in the OCI Registry where the platform will publish OCI images." - #@schema/examples ("Repository on GitHub Container Registry", "my-org") - 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: `standalone`, `dev`, `build`." + #@schema/desc "Settings for accessing the OCI registry that the platform will use." + oci: + #@schema/desc "Configuration for the Secret holding the credentials to pull images from the OCI registry." + pull_secret: + #@schema/desc "The name of the Secret holding the credentials to pull images from the OCI registry." name: "" - #@schema/desc "The namespace of the Secret holding the credentials to access the OCI registry." + #@schema/desc "The namespace of the Secret holding the credentials to pull images from the OCI registry." namespace: kadras-system #@schema/desc "Settings for Cosign, used for signing and verifying OCI artifacts." @@ -83,10 +77,6 @@ contour: {} #@schema/type any=True crossplane: {} -#@schema/desc "Configuration for the Dapr package." -#@schema/type any=True -dapr: {} - #@schema/desc "Configuration for the Dependency Track package." #@schema/type any=True dependency_track: {} diff --git a/test/setup/kind/v1.33/kind-config.yml b/test/setup/kind/v1.33/kind-config.yml index 9ea11da..cda887c 100644 --- a/test/setup/kind/v1.33/kind-config.yml +++ b/test/setup/kind/v1.33/kind-config.yml @@ -3,9 +3,9 @@ kind: Cluster apiVersion: kind.x-k8s.io/v1alpha4 nodes: - role: control-plane - image: kindest/node:v1.33.1 + image: kindest/node:v1.33.2 - role: worker - image: kindest/node:v1.33.1 + image: kindest/node:v1.33.2 extraPortMappings: - containerPort: 80 hostPort: 80