diff --git a/README.md b/README.md index 050f6ba..abd9056 100644 --- a/README.md +++ b/README.md @@ -120,7 +120,7 @@ the [Applications](https://console.cloud.google.com/kubernetes/application) page The application page for test-1 shows that all the deployments are green. This screenshot is stored in this issue: https://github.com/jetstack/jetstack-secure-gcm/issues/21 -**Note:** by default, the `preflight` deployment is scaled to 0. After +**Note:** by default, the `jetstack-secure` deployment is scaled to 0. After completing the steps in the [next section](#step-2-log-into-the-jetstack-secure-dashboard), the deployment will start working. @@ -355,21 +355,21 @@ kubectl -n $NAMESPACE apply -f agent-config.yaml kubectl -n $NAMESPACE rollout restart $(kubectl -n $NAMESPACE get deploy -oname | grep agent) ``` -You will now be able to "activate" the Preflight deployment: +You will now be able to "activate" the `jetstack-secure` deployment: ```sh -kubectl -n $NAMESPACE scale deploy --replicas=1 --selector=app.kubernetes.io/name=agent +kubectl -n $NAMESPACE scale deploy --replicas=1 --selector=app.kubernetes.io/name=jetstack-secure ``` You should eventually see that the pod is `READY 1/1`: ```sh -% kubectl -n $NAMESPACE get pod -l app.kubernetes.io/component=preflight +% kubectl -n $NAMESPACE get pod -l app.kubernetes.io/name=jetstack-secure NAME READY STATUS AGE agent-6b8d5ccb6f-6gnjm 1/1 Running 20h ``` -After seeing `READY 1/1`, return to the dashboard. Once the agent has started communicating with the preflight platform, you will be taken to the cluster view. At this point, installation is complete and you can begin to monitor resources within the dashboard. +After seeing `READY 1/1`, return to the dashboard. Once the agent has started communicating with the Jetstack Secure platform, you will be taken to the cluster view. At this point, installation is complete and you can begin to monitor resources within the dashboard. Below is an example of how to issue a certificate: @@ -683,9 +683,9 @@ helm template "$APP_INSTANCE_NAME" chart/jetstack-secure-gcm \ --set google-cas-issuer.image.tag="$TAG" \ --set google-cas-issuer.serviceAccount.create=true \ --set google-cas-issuer.serviceAccount.name=google-cas-issuer \ - --set preflight.image.tag="$TAG" \ - --set preflight.serviceAccount.create=true \ - --set preflight.rbac.create=true \ + --set jetstack-secure.image.tag="$TAG" \ + --set jetstack-secure.serviceAccount.create=true \ + --set jetstack-secure.rbac.create=true \ --set cert-manager.ubbagent.image.tag="$TAG" \ --set cert-manager.ubbagent.reportingSecretName=jetstack-secure-for-cert-mana-1-license \ > "${APP_INSTANCE_NAME}_manifest.yaml" @@ -699,7 +699,7 @@ helm template "$APP_INSTANCE_NAME" chart/jetstack-secure-gcm \ > --set cert-manager.cainjector.image.repository=marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-cainjector > --set cert-manager.webhook.image.repository=marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-webhook > --set google-cas-issuer.image.repository=marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-google-cas-issuer -> --set preflight.image.repository=marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/preflight +> --set jetstack-secure.image.repository=marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/jetstack-secure > --set cert-manager.ubbagent.image.repository=marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/ubbagent > ``` diff --git a/docs/TESTING-DEPLOYER.md b/docs/TESTING-DEPLOYER.md index 1b264a3..e6614c0 100644 --- a/docs/TESTING-DEPLOYER.md +++ b/docs/TESTING-DEPLOYER.md @@ -32,10 +32,10 @@ of `1` to the `time` value. The unit for `time` is something we have configured in the [pricing panel](https://console.cloud.google.com/partner/editor/jetstack-public/jetstack-secure-for-cert-manager?project=jetstack-public&authuser=4&form=saasK8sPricingPanel). -| Field | Value | -| -------------- | ------ | -| ID | `time` | -| Unit | `h` | +| Field | Value | +| ----- | ------ | +| ID | `time` | +| Unit | `h` | Note that the cert-manager deployment should always be run with replicas=1. High-availability (replicas > 1) is not supported yet, and the application will @@ -131,7 +131,7 @@ to deploy the Jetstack Secure for cert-manager application. In our case, the image embeds: - The `helm` tool, -- The Helm charts for cert-manager, google-cas-issuer and preflight. +- The Helm charts for cert-manager, google-cas-issuer and jetstack-secure. There are two deployer tags: @@ -176,10 +176,10 @@ marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager:1.1.0-gcm.1 marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-acmesolver:1.1.0-gcm.1 marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-cainjector:1.1.0-gcm.1 marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-google-cas-issuer:1.1.0-gcm.1 -marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-preflight:1.1.0-gcm.1 +marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-jetstack-secure:1.1.0-gcm.1 marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-webhook:1.1.0-gcm.1 marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/deployer:1.1.0-gcm.1 -marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/preflight:1.1.0-gcm.1 +marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/jetstack-secure:1.1.0-gcm.1 marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/smoke-test:1.1.0-gcm.1 marketplace.gcr.io/jetstack-public/jetstack-secure-for-cert-manager/ubbagent:1.1.0-gcm.1 ``` @@ -207,7 +207,7 @@ gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-acmesolver: gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-cainjector:1.1.0-gcm.1 gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-google-cas-issuer:1.1.0-gcm.1 gcr.io/jetstack-public/jetstack-secure-for-cert-manager/cert-manager-webhook:1.1.0-gcm.1 -gcr.io/jetstack-public/jetstack-secure-for-cert-manager/preflight:1.1.0-gcm.1 +gcr.io/jetstack-public/jetstack-secure-for-cert-manager/jetstack-secure:1.1.0-gcm.1 gcr.io/jetstack-public/jetstack-secure-for-cert-manager/ubbagent:1.1.0-gcm.1 ``` @@ -228,7 +228,7 @@ retagall() { # Usage: retagall FROM_REGISTRY FROM_TAG TO_REGISTRY TO_TAG retag $FROM/cert-manager-cainjector:$FROM_TAG $TO/cert-manager-cainjector:$TO_TAG || exit 1 retag $FROM/cert-manager-webhook:$FROM_TAG $TO/cert-manager-webhook:$TO_TAG || exit 1 retag $FROM/cert-manager-google-cas-issuer:$FROM_TAG $TO/cert-manager-google-cas-issuer:$TO_TAG || exit 1 - retag $FROM/preflight:$FROM_TAG $TO/preflight:$TO_TAG || exit 1 + retag $FROM/jetstack-secure:$FROM_TAG $TO/jetstack-secure:$TO_TAG || exit 1 retag gcr.io/cloud-marketplace-tools/metering/ubbagent:latest $TO/ubbagent:$TO_TAG || exit 1 } APP_VERSION=1.1.0-gcm.2 @@ -260,7 +260,7 @@ retagall() { # Usage: retagall FROM_REGISTRY FROM_TAG TO_REGISTRY TO_TAG retag $FROM/cert-manager-cainjector:$FROM_TAG $TO/cert-manager-cainjector:$TO_TAG || exit 1 retag $FROM/cert-manager-webhook:$FROM_TAG $TO/cert-manager-webhook:$TO_TAG || exit 1 retag $FROM/cert-manager-google-cas-issuer:$FROM_TAG $TO/cert-manager-google-cas-issuer:$TO_TAG || exit 1 - retag $FROM/preflight:$FROM_TAG $TO/preflight:$TO_TAG || exit 1 + retag $FROM/jetstack-secure:$FROM_TAG $TO/jetstack-secure:$TO_TAG || exit 1 retag gcr.io/cloud-marketplace-tools/metering/ubbagent:latest $TO/ubbagent:$TO_TAG || exit 1 } @@ -364,9 +364,9 @@ cert-manager: google-cas-issuer: nameOverride: jetstack-secure-gcm fullnameOverride: google-cas-issuer -preflight: +jetstack-secure: nameOverride: jetstack-secure-gcm - fullnameOverride: preflight + fullnameOverride: jetstack-secure ``` Then we make sure all the objects are set with the labels: