From b2f062fdad8dda72f4034b5c0f0a149f87a3507e Mon Sep 17 00:00:00 2001 From: Chuck D'Antonio Date: Tue, 31 Oct 2023 11:59:02 -0400 Subject: [PATCH] Bumps Harbor version and syncs checksums --- .../01-preparing-to-use-the-sdk/assignment.md | 4 ++-- .../01-preparing-to-use-the-sdk/solve-shell | 2 +- .../02-enabling-the-sdk/assignment.md | 6 +++--- .../02-enabling-the-sdk/check-shell | 4 ++-- .../02-enabling-the-sdk/solve-shell | 2 +- .../03-creating-a-release/assignment.md | 10 +++++----- .../03-creating-a-release/check-shell | 12 ++++++------ .../03-creating-a-release/solve-shell | 6 +++--- .../04-installing-the-application/assignment.md | 4 ++-- .../04-installing-the-application/check-shell | 2 +- .../05-validating-the-install/assignment.md | 2 +- instruqt/distributing-with-replicated/track.yml | 3 ++- 12 files changed, 29 insertions(+), 28 deletions(-) diff --git a/instruqt/distributing-with-replicated/01-preparing-to-use-the-sdk/assignment.md b/instruqt/distributing-with-replicated/01-preparing-to-use-the-sdk/assignment.md index ab2de0ed3..1c5321194 100755 --- a/instruqt/distributing-with-replicated/01-preparing-to-use-the-sdk/assignment.md +++ b/instruqt/distributing-with-replicated/01-preparing-to-use-the-sdk/assignment.md @@ -1,6 +1,6 @@ --- slug: preparing-to-use-the-sdk -id: nlsiefddbiay +id: mneddevjccio type: challenge title: Preparing to Use the SDK teaser: Getting ready to use the Replicated SDK @@ -54,7 +54,7 @@ Helm chart. Let's pull down the chart so that we can get started. ```bash -helm pull --version 16.6.8 oci://registry-1.docker.io/bitnamicharts/harbor --untar +helm pull --version 19.1.0 oci://registry-1.docker.io/bitnamicharts/harbor --untar ``` Let's also set up our shell for interacting with the Replicated diff --git a/instruqt/distributing-with-replicated/01-preparing-to-use-the-sdk/solve-shell b/instruqt/distributing-with-replicated/01-preparing-to-use-the-sdk/solve-shell index 42ecd6dc7..ca4b481ef 100755 --- a/instruqt/distributing-with-replicated/01-preparing-to-use-the-sdk/solve-shell +++ b/instruqt/distributing-with-replicated/01-preparing-to-use-the-sdk/solve-shell @@ -17,4 +17,4 @@ fi tmux send-keys -t shell export SPACE 'REPLICATED_API_TOKEN=' "$(agent variable get REPLICATED_API_TOKEN)" ENTER tmux send-keys -t shell export SPACE 'REPLICATED_APP=' "$(agent variable get REPLICATED_APP)" ENTER -tmux send-keys -t shell 'helm pull --version 16.6.8 oci://registry-1.docker.io/bitnamicharts/harbor --untar' ENTER +tmux send-keys -t shell 'helm pull --version 19.1.0 oci://registry-1.docker.io/bitnamicharts/harbor --untar' ENTER diff --git a/instruqt/distributing-with-replicated/02-enabling-the-sdk/assignment.md b/instruqt/distributing-with-replicated/02-enabling-the-sdk/assignment.md index 142ee681c..5a38c284a 100755 --- a/instruqt/distributing-with-replicated/02-enabling-the-sdk/assignment.md +++ b/instruqt/distributing-with-replicated/02-enabling-the-sdk/assignment.md @@ -1,6 +1,6 @@ --- slug: enabling-the-sdk -id: zulqmrtftnst +id: pzlc29lz2h9y type: challenge title: Enabling the Replicated SDK teaser: Incorporate the SDK into your application @@ -63,7 +63,7 @@ a fairly large change. It's not a breaking change, though, so let's just bump the minor version number. ``` -version: 16.7.0 +version: 19.2.0 ``` ![Bumping the Chart Version](../assets/bumping-the-version.png) @@ -101,5 +101,5 @@ ls release which shows ``` -harbor-16.7.0.tgz +harbor-19.2.0.tgz ``` diff --git a/instruqt/distributing-with-replicated/02-enabling-the-sdk/check-shell b/instruqt/distributing-with-replicated/02-enabling-the-sdk/check-shell index 8d894bfc1..947259354 100755 --- a/instruqt/distributing-with-replicated/02-enabling-the-sdk/check-shell +++ b/instruqt/distributing-with-replicated/02-enabling-the-sdk/check-shell @@ -5,7 +5,7 @@ set -euxo pipefail result=0 # check for an updated version number -if [[ "$(yq .version mastodon/Chart.yaml)" == "16.7.0" ]] ; then +if [[ "$(yq .version mastodon/Chart.yaml)" == "19.2.0" ]] ; then fail-message 'Please be sure to update the version of the Mastodon Helm chart to reflect your changes' let "result = result + 1" fi @@ -23,7 +23,7 @@ if [[ "$(yq '.dependencies[] | select ( .name == "replicated" ) | .name')" == " fi # check for the repackaged Helm chart -if [[ ! -f /home/replicant/release/harbor-16.7.0.tgz ]] ; then +if [[ ! -f /home/replicant/release/harbor-19.2.0.tgz ]] ; then fail-message 'Please be sure to update and repackage the Harbor Helm chart' let "result = result + 1" fi diff --git a/instruqt/distributing-with-replicated/02-enabling-the-sdk/solve-shell b/instruqt/distributing-with-replicated/02-enabling-the-sdk/solve-shell index 401832fcc..e2dab0f23 100755 --- a/instruqt/distributing-with-replicated/02-enabling-the-sdk/solve-shell +++ b/instruqt/distributing-with-replicated/02-enabling-the-sdk/solve-shell @@ -16,7 +16,7 @@ if ! tmux has-session -t shell ; then fi # updat the chart version -tmux send-keys -t shell $'yq -i \'.version = "16.7.0"\' harbor/Chart.yaml' ENTER +tmux send-keys -t shell $'yq -i \'.version = "19.2.0"\' harbor/Chart.yaml' ENTER # add the SDK dependency tmux send-keys -t shell "yq -i '.dependencies += { \"name\": \"replicated\", \"repository\": \"oci://registry.replicated.com/library\", \"version\": \"$(agent variable get REPLICATED_SDK_VERSION)\"}' harbor/Chart.yaml" ENTER diff --git a/instruqt/distributing-with-replicated/03-creating-a-release/assignment.md b/instruqt/distributing-with-replicated/03-creating-a-release/assignment.md index 923e00f88..2889444d7 100755 --- a/instruqt/distributing-with-replicated/03-creating-a-release/assignment.md +++ b/instruqt/distributing-with-replicated/03-creating-a-release/assignment.md @@ -1,6 +1,6 @@ --- slug: creating-a-release -id: xfimjuqgm1r5 +id: qwjuyn8lmauy type: challenge title: Releasing an Application teaser: Creating a release on the Replicated Platform @@ -85,11 +85,11 @@ To create a release, run the following command. We're using the `Unstable` channel since we're releasing our most recent change. ``` -replicated release create --promote Unstable --yaml-dir ./release --version 16.7.0 \ +replicated release create --promote Unstable --yaml-dir ./release --version 19.2.0 \ --release-notes "Prepares for distribution with Replicated by incorporating the Replicated SDK" ``` -This creates a release for version `16.7.0` of your Harbor Helm +This creates a release for version `19.2.0` of your Harbor Helm chart, and promotes it to the `Unstable` channel. The `create` command output a sequence number that you'll need for `promote` (it will be `1` if you haven't explored releasing a bit more). @@ -127,14 +127,14 @@ promoting to `Beta`, and ultimately releasing on `Stable`. For the purposes of the lab, let's just promote the release straight through. ``` -replicated release promote 1 Beta --version 16.7.0 \ +replicated release promote 1 Beta --version 19.2.0 \ --release-notes "Prepares for distribution with Replicated by incorporating the Replicated SDK" ``` and then ``` -replicated release promote 1 Stable --version 16.7.0 \ +replicated release promote 1 Stable --version 19.2.0 \ --release-notes "Prepares for distribution with Replicated by incorporating the Replicated SDK" ``` diff --git a/instruqt/distributing-with-replicated/03-creating-a-release/check-shell b/instruqt/distributing-with-replicated/03-creating-a-release/check-shell index 224237871..597b2d25d 100755 --- a/instruqt/distributing-with-replicated/03-creating-a-release/check-shell +++ b/instruqt/distributing-with-replicated/03-creating-a-release/check-shell @@ -17,22 +17,22 @@ fi # check for release to Unstable unstable_version=$(curl --header "Accept: application/json" --header "Authorization: ${api_token}" https://api.replicated.com/vendor/v3/apps | jq -r '.apps[0].channels[] | select( .name == "Unstable" ) | .currentVersion') -if [[ ! "${unstable_version}" == "16.7.0" ]] ; then - fail-message $'Please be sure to release the applicaton to the \`Unstable\` channel with version \`16.7.0\`' +if [[ ! "${unstable_version}" == "19.2.0" ]] ; then + fail-message $'Please be sure to release the applicaton to the \`Unstable\` channel with version \`19.2.0\`' let "result = result + 1" fi # check for promotion to Beta beta_version=$(curl --header "Accept: application/json" --header "Authorization: ${api_token}" https://api.replicated.com/vendor/v3/apps | jq -r '.apps[0].channels[] | select( .name == "Beta" ) | .currentVersion') -if [[ ! "${beta_version}" == "16.7.0" ]] ; then - fail-message $'Please be sure to promote the applicaton to the \`Beta\` channel with version \`16.7.0\`' +if [[ ! "${beta_version}" == "19.2.0" ]] ; then + fail-message $'Please be sure to promote the applicaton to the \`Beta\` channel with version \`19.2.0\`' let "result = result + 1" fi # check for promotion to Stable stable_version=$(curl --header "Accept: application/json" --header "Authorization: ${api_token}" https://api.replicated.com/vendor/v3/apps | jq -r '.apps[0].channels[] | select( .name == "Stable" ) | .currentVersion') -if [[ ! "${stable_version}" == "16.7.0" ]] ; then - fail-message $'Please be sure to promote the applicaton to the \`Stable\` channel with version \`16.7.0\`' +if [[ ! "${stable_version}" == "19.2.0" ]] ; then + fail-message $'Please be sure to promote the applicaton to the \`Stable\` channel with version \`19.2.0\`' let "result = result + 1" fi diff --git a/instruqt/distributing-with-replicated/03-creating-a-release/solve-shell b/instruqt/distributing-with-replicated/03-creating-a-release/solve-shell index d0400ea39..7419ca69a 100755 --- a/instruqt/distributing-with-replicated/03-creating-a-release/solve-shell +++ b/instruqt/distributing-with-replicated/03-creating-a-release/solve-shell @@ -21,7 +21,7 @@ replicated channel create --name LTS --description "Releases with long-term supp --app ${app_slug} --token ${api_token} # release to the `Unstable` channel -replicated release create --promote Unstable --yaml-dir /home/replicant/release --version 16.7.0 \ +replicated release create --promote Unstable --yaml-dir /home/replicant/release --version 19.2.0 \ --release-notes "Prepares for distribution with Replicated by incorporating the Replicated SDK" \ --app ${app_slug} --token ${api_token} @@ -29,11 +29,11 @@ replicated release create --promote Unstable --yaml-dir /home/replicant/release release_sequence=$(curl --header "Accept: application/json" --header "Authorization: ${api_token}" https://api.replicated.com/vendor/v3/apps | jq -r '.apps[0].channels[] | select( .name == "Unstable" ) | .releaseSequence') # promote to the `Beta` channel -replicated release promote ${release_sequence} Beta --version 16.7.0 \ +replicated release promote ${release_sequence} Beta --version 19.2.0 \ --release-notes "Prepares for distribution with Replicated by incorporating the Replicated SDK" \ --app ${app_slug} --token ${api_token} # promote to the `Stable` channel -replicated release promote ${release_sequence} Stable --version 16.7.0 \ +replicated release promote ${release_sequence} Stable --version 19.2.0 \ --release-notes "Prepares for distribution with Replicated by incorporating the Replicated SDK" \ --app ${app_slug} --token ${api_token} diff --git a/instruqt/distributing-with-replicated/04-installing-the-application/assignment.md b/instruqt/distributing-with-replicated/04-installing-the-application/assignment.md index c1ba1101b..2b2a01d7c 100755 --- a/instruqt/distributing-with-replicated/04-installing-the-application/assignment.md +++ b/instruqt/distributing-with-replicated/04-installing-the-application/assignment.md @@ -1,6 +1,6 @@ --- slug: installing-the-application -id: cqhjo8z5iier +id: 0jr3scssmdfw type: challenge title: Installing the Application teaser: Let's install the application as your customer @@ -42,7 +42,7 @@ Password: `[[ Instruqt-Var key="PASSWORD" hostname="shell" ]]` You'll land on the "Channels" page for your app, which will show the release channels we discussed in the previous step. Notice that -each channel shows the current version `16.7.0` while the channel LTS, which we haven't released to, reflects +each channel shows the current version `19.2.0` while the channel LTS, which we haven't released to, reflects that. ![Vendor Portal Release Channels](../assets/vendor-portal-landing.png) diff --git a/instruqt/distributing-with-replicated/04-installing-the-application/check-shell b/instruqt/distributing-with-replicated/04-installing-the-application/check-shell index 5f402df12..1b0c20b0d 100755 --- a/instruqt/distributing-with-replicated/04-installing-the-application/check-shell +++ b/instruqt/distributing-with-replicated/04-installing-the-application/check-shell @@ -8,7 +8,7 @@ result=0 # check for release to Unstable installed_chart=$(helm list -o yaml --kubeconfig /home/replicant/.kube/config | yq '.[0].chart') -if [[ ! "${installed_chart}" == "harbor-16.7.0" ]] ; then +if [[ ! "${installed_chart}" == "harbor-19.2.0" ]] ; then fail-message 'Please be sure to install the Harbor Helm chart' let "result = result + 1" fi diff --git a/instruqt/distributing-with-replicated/05-validating-the-install/assignment.md b/instruqt/distributing-with-replicated/05-validating-the-install/assignment.md index ee9f8d51a..7e22a6e6f 100755 --- a/instruqt/distributing-with-replicated/05-validating-the-install/assignment.md +++ b/instruqt/distributing-with-replicated/05-validating-the-install/assignment.md @@ -1,6 +1,6 @@ --- slug: validating-the-install -id: wsuxuhp33vfz +id: vtvk2dkrwklo type: challenge title: Observing the Customer Instance teaser: Observing your customer install diff --git a/instruqt/distributing-with-replicated/track.yml b/instruqt/distributing-with-replicated/track.yml index a541611ca..7861d42d6 100755 --- a/instruqt/distributing-with-replicated/track.yml +++ b/instruqt/distributing-with-replicated/track.yml @@ -25,4 +25,5 @@ lab_config: overlay: false width: 33 position: right -checksum: "4697812039007069627" + enableLoadingMessages: true +checksum: "9421035943818506418"