diff --git a/README.md b/README.md index 4fb65651..0b8c40fb 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ kubectl wait --namespace ingress-nginx \ --selector=app.kubernetes.io/component=controller \ --timeout=90s -OPENSHIFT_APPS_SUBDOMAIN=localhost envsubst < ./examples/values-kind-sigstore.yaml | helm upgrade -i trusted-artifact-signer --debug ./charts/trusted-artifact-signer --wait --wait-for-jobs -n sigstore --create-namespace --values - +OPENSHIFT_APPS_SUBDOMAIN=localhost envsubst < ./examples/values-kind-sigstore.yaml | helm upgrade -i trusted-artifact-signer --debug ./charts/trusted-artifact-signer --wait --wait-for-jobs -n trusted-artifact-signer --create-namespace --values - helm test -n sigstore trusted-artifact-signer # tests are in charts/trusted-artifact-signer/templates/tests diff --git a/charts/trusted-artifact-signer/Chart.yaml b/charts/trusted-artifact-signer/Chart.yaml index 4e708442..9fec24fc 100644 --- a/charts/trusted-artifact-signer/Chart.yaml +++ b/charts/trusted-artifact-signer/Chart.yaml @@ -33,4 +33,4 @@ sources: # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.7 +version: 0.1.8 diff --git a/charts/trusted-artifact-signer/README.md b/charts/trusted-artifact-signer/README.md index 26a3a84a..ae8643a6 100644 --- a/charts/trusted-artifact-signer/README.md +++ b/charts/trusted-artifact-signer/README.md @@ -3,7 +3,7 @@ A Helm chart for deploying Sigstore scaffold chart that is opinionated for OpenShift -![Version: 0.1.7](https://img.shields.io/badge/Version-0.1.7-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) +![Version: 0.1.8](https://img.shields.io/badge/Version-0.1.8-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ## Overview @@ -243,7 +243,7 @@ Kubernetes: `>= 1.19.0-0` | scaffold.trillian.mysql.args | | list | `[]` | | scaffold.trillian.mysql.fullnameOverride | | string | `"trillian-mysql"` | | scaffold.trillian.mysql.gcp.scaffoldSQLProxy.registry | | string | `"quay.io"` | -| scaffold.trillian.mysql.gcp.scaffoldSQLProxy.repository | | string | `"docker pull quay.io/redhat-user-workloads/rhtas-tenant/rhtas-stack-1-0-beta/cloudsqlproxy"` | +| scaffold.trillian.mysql.gcp.scaffoldSQLProxy.repository | | string | `"redhat-user-workloads/rhtas-tenant/rhtas-stack-1-0-beta/cloudsqlproxy"` | | scaffold.trillian.mysql.gcp.scaffoldSQLProxy.version | | string | `"build-b9416-1696274309"` | | scaffold.trillian.mysql.image.pullPolicy | | string | `"IfNotPresent"` | | scaffold.trillian.mysql.image.registry | | string | `"quay.io"` | @@ -276,7 +276,7 @@ Kubernetes: `>= 1.19.0-0` | scaffold.trillian.redis.image.repository | | string | `"rhel9/redis-6"` | | scaffold.trillian.redis.image.version | | string | `"sha256:031a5a63611e1e6a9fec47492a32347417263b79ad3b63bcee72fc7d02d64c94"` | | scaffold.tsa.enabled | | bool | `false` | -| scaffold.tsa.forceNamespace | | string | `"tsa-sytem"` | +| scaffold.tsa.forceNamespace | | string | `"tsa-system"` | | scaffold.tsa.namespace.create | | bool | `false` | | scaffold.tsa.namespace.name | | string | `"tsa-system"` | | scaffold.tsa.server.fullnameOverride | | string | `"tsa-server"` | diff --git a/charts/trusted-artifact-signer/values.yaml b/charts/trusted-artifact-signer/values.yaml index f0c986f4..dcd0e222 100644 --- a/charts/trusted-artifact-signer/values.yaml +++ b/charts/trusted-artifact-signer/values.yaml @@ -317,7 +317,7 @@ scaffold: gcp: scaffoldSQLProxy: registry: quay.io - repository: docker pull quay.io/redhat-user-workloads/rhtas-tenant/rhtas-stack-1-0-beta/cloudsqlproxy + repository: redhat-user-workloads/rhtas-tenant/rhtas-stack-1-0-beta/cloudsqlproxy version: "build-b9416-1696274309" image: registry: quay.io @@ -391,7 +391,7 @@ scaffold: tsa: enabled: false - forceNamespace: tsa-sytem + forceNamespace: tsa-system namespace: create: false name: tsa-system diff --git a/quick-start-with-keycloak.md b/quick-start-with-keycloak.md index ee8c6025..e42b2ee7 100644 --- a/quick-start-with-keycloak.md +++ b/quick-start-with-keycloak.md @@ -30,7 +30,7 @@ oc -n rekor-system create secret generic rekor-private-key --from-file=private=. 3. Run the following: ```shell -OPENSHIFT_APPS_SUBDOMAIN=apps.$(oc get dns cluster -o jsonpath='{ .spec.baseDomain }') envsubst < examples/values-sigstore-openshift.yaml | helm upgrade -i trusted-artifact-signer --debug charts/trusted-artifact-signer -n sigstore --create-namespace --values - +OPENSHIFT_APPS_SUBDOMAIN=apps.$(oc get dns cluster -o jsonpath='{ .spec.baseDomain }') envsubst < examples/values-sigstore-openshift.yaml | helm upgrade -i trusted-artifact-signer --debug charts/trusted-artifact-signer -n trusted-artifact-signer --create-namespace --values - ``` A good way to tell if things are progressing well is to watch `oc get jobs -A` and when the tuf-system job is complete,