From 48b59481742b746d726d22f585d2077cb8c99673 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Wed, 26 Jan 2022 16:19:45 -0500 Subject: [PATCH 01/21] bump API --- .github/workflows/packer.yaml | 2 +- app/components/StatusBadge.tsx | 1 + libs/api/__generated__/Api.ts | 39 +++++++++++++++++++++++--- libs/api/__generated__/OMICRON_VERSION | 2 +- packer/oxapi_demo | 8 ++++++ 5 files changed, 46 insertions(+), 6 deletions(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index 5d4d159425..fe75c08b7a 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -75,7 +75,7 @@ jobs: CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}} SSL_CERT: ${{secrets.SSL_CERT}} SSL_KEY: ${{secrets.SSL_KEY}} - API_VERSION: a75149c4b84b51647928c2c3484dc4370495f023 + API_VERSION: 2c664ef488fc19b5752a16ad089a9cf49fc058a3 # get the image information from gcloud - name: Get image information diff --git a/app/components/StatusBadge.tsx b/app/components/StatusBadge.tsx index cb249d797b..78f7b5b07a 100644 --- a/app/components/StatusBadge.tsx +++ b/app/components/StatusBadge.tsx @@ -12,6 +12,7 @@ const INSTANCE_COLORS: Record = { stopping: 'yellow', stopped: 'lightGray', repairing: 'blue', + migrating: 'yellow', failed: 'red', destroyed: 'darkGray', } diff --git a/libs/api/__generated__/Api.ts b/libs/api/__generated__/Api.ts index c4b44070d2..fd81277376 100644 --- a/libs/api/__generated__/Api.ts +++ b/libs/api/__generated__/Api.ts @@ -180,6 +180,13 @@ export type InstanceCreate = { ncpus: InstanceCpuCount } +/** + * Migration parameters for an [`Instance`] + */ +export type InstanceMigrate = { + dstSledUuid: string +} + /** * A single page of results */ @@ -206,6 +213,7 @@ export type InstanceState = | 'stopping' | 'stopped' | 'rebooting' + | 'migrating' | 'repairing' | 'failed' | 'destroyed' @@ -1338,6 +1346,14 @@ export interface InstanceDisksDetachParams { projectName: Name } +export interface ProjectInstancesMigrateInstanceParams { + instanceName: Name + + orgName: Name + + projectName: Name +} + export interface ProjectInstancesInstanceRebootParams { instanceName: Name @@ -2037,7 +2053,6 @@ export class Api extends HttpClient { /** * Update a specific organization. - * * TODO-correctness: Is it valid for PUT to accept application/json that's a subset of what the resource actually represents? If not, is that a problem? (HTTP may require that this be idempotent.) If so, can we get around that having this be a slightly different content-type (e.g., "application/json-patch")? We should see what other APIs do. */ organizationsPutOrganization: ( { orgName }: OrganizationsPutOrganizationParams, @@ -2108,7 +2123,6 @@ export class Api extends HttpClient { /** * Update a specific project. - * * TODO-correctness: Is it valid for PUT to accept application/json that's a subset of what the resource actually represents? If not, is that a problem? (HTTP may require that this be idempotent.) If so, can we get around that having this be a slightly different content-type (e.g., "application/json-patch")? We should see what other APIs do. */ organizationProjectsPutProject: ( { orgName, projectName }: OrganizationProjectsPutProjectParams, @@ -2151,7 +2165,6 @@ export class Api extends HttpClient { /** * Create a disk in a project. - * * TODO-correctness See note about instance create. This should be async. */ projectDisksPost: ( { orgName, projectName }: ProjectDisksPostParams, @@ -2207,7 +2220,6 @@ export class Api extends HttpClient { /** * Create an instance in a project. - * * TODO-correctness This is supposed to be async. Is that right? We can create the instance immediately -- it's just not booted yet. Maybe the boot operation is what's a separate operation_id. What about the response code (201 Created vs 202 Accepted)? Is that orthogonal? Things can return a useful response, including an operation id, with either response code. Maybe a "reboot" operation would return a 202 Accepted because there's no actual resource created? */ projectInstancesPost: ( { orgName, projectName }: ProjectInstancesPostParams, @@ -2289,6 +2301,25 @@ export class Api extends HttpClient { ...params, }), + /** + * Migrate an instance to a different propolis-server, possibly on a different sled. + */ + projectInstancesMigrateInstance: ( + { + instanceName, + orgName, + projectName, + }: ProjectInstancesMigrateInstanceParams, + data: InstanceMigrate, + params: RequestParams = {} + ) => + this.request({ + path: `/organizations/${orgName}/projects/${projectName}/instances/${instanceName}/migrate`, + method: 'POST', + body: data, + ...params, + }), + /** * Reboot an instance. */ diff --git a/libs/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION index 4c77980788..8c64e35fa3 100644 --- a/libs/api/__generated__/OMICRON_VERSION +++ b/libs/api/__generated__/OMICRON_VERSION @@ -1,2 +1,2 @@ # generated file. do not update manually. see docs/update-pinned-api.md -a75149c4b84b51647928c2c3484dc4370495f023 +2c664ef488fc19b5752a16ad089a9cf49fc058a3 diff --git a/packer/oxapi_demo b/packer/oxapi_demo index bc24146a8f..fdd1395ff5 100755 --- a/packer/oxapi_demo +++ b/packer/oxapi_demo @@ -39,6 +39,7 @@ INSTANCES instance_create_demo ORGANIZATION_NAME PROJECT_NAME INSTANCE_NAME instance_get ORGANIZATION_NAME PROJECT_NAME INSTANCE_NAME instance_delete ORGANIZATION_NAME PROJECT_NAME INSTANCE_NAME + instance_migrate ORGANIZATION_NAME PROJECT_NAME INSTANCE_NAME SLED_ID instance_stop ORGANIZATION_NAME PROJECT_NAME INSTANCE_NAME instance_start ORGANIZATION_NAME PROJECT_NAME INSTANCE_NAME @@ -278,6 +279,13 @@ function cmd_instance_delete do_curl "/organizations/$1/projects/$2/instances/$3" -X DELETE } +function cmd_instance_migrate +{ + [[ $# != 4 ]] && usage "expected ORGANIZATION_NAME PROJECT_NAME INSTANCE_NAME SLED_ID" + mkjson dst_sled_uuid="$4" | \ + do_curl "/organizations/$1/projects/$2/instances/$3/migrate" -X POST -T - +} + function cmd_instance_stop { [[ $# != 3 ]] && usage "expected ORGANIZATION_NAME PROJECT_NAME INSTANCE_NAME" From f40a62969cbd6f7705a2a1d557d8c66d2ebe150a Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 21:28:27 +0000 Subject: [PATCH 02/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index d63d3680e0..69a8f36f35 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643064587 \ + --image=packer-1643232023 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From e04d6a2964cc0b6d60b22f0365eda480bab86285 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Wed, 26 Jan 2022 21:29:10 -0500 Subject: [PATCH 03/21] bump api again for sled agent sim fix --- .github/workflows/packer.yaml | 2 +- libs/api/__generated__/OMICRON_VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index fe75c08b7a..ed1caa89af 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -75,7 +75,7 @@ jobs: CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}} SSL_CERT: ${{secrets.SSL_CERT}} SSL_KEY: ${{secrets.SSL_KEY}} - API_VERSION: 2c664ef488fc19b5752a16ad089a9cf49fc058a3 + API_VERSION: ec222df9b28e39346424ba1fe190bc56580b2453 # get the image information from gcloud - name: Get image information diff --git a/libs/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION index 8c64e35fa3..a4fa69407f 100644 --- a/libs/api/__generated__/OMICRON_VERSION +++ b/libs/api/__generated__/OMICRON_VERSION @@ -1,2 +1,2 @@ # generated file. do not update manually. see docs/update-pinned-api.md -2c664ef488fc19b5752a16ad089a9cf49fc058a3 +ec222df9b28e39346424ba1fe190bc56580b2453 From d78e1e45b764d02cbf176105012188cde8d64c5d Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 02:38:07 +0000 Subject: [PATCH 04/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index 69a8f36f35..7d9dd3dd39 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643232023 \ + --image=packer-1643250587 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From fbf6d4a5518961afed3f1b84c80421297109b679 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Thu, 27 Jan 2022 00:16:38 -0500 Subject: [PATCH 05/21] force packer rebuild and deploy --- .github/workflows/packer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index ed1caa89af..ace7d3448d 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -106,4 +106,4 @@ jobs: with: add: ./tools/create_gcp_instance.sh message: 'automatically update packer-id' - default_author: github_actions + default_author: github_actions \ No newline at end of file From 293403f36f79f2bfb67b3a10348ceef5ce0aed78 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 05:25:23 +0000 Subject: [PATCH 06/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index 7d9dd3dd39..9e94be1351 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643250587 \ + --image=packer-1643260632 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From 804995473f89bb4fd133df4ae0e2bc6dce9aa4ae Mon Sep 17 00:00:00 2001 From: David Crespo Date: Thu, 27 Jan 2022 11:29:26 -0500 Subject: [PATCH 07/21] try adding a sleep before making API calls to populate db --- .github/workflows/packer.yaml | 2 +- tools/gcp_instance_startup_script.sh | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index ace7d3448d..ed1caa89af 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -106,4 +106,4 @@ jobs: with: add: ./tools/create_gcp_instance.sh message: 'automatically update packer-id' - default_author: github_actions \ No newline at end of file + default_author: github_actions diff --git a/tools/gcp_instance_startup_script.sh b/tools/gcp_instance_startup_script.sh index 290aefd606..d80df050e9 100755 --- a/tools/gcp_instance_startup_script.sh +++ b/tools/gcp_instance_startup_script.sh @@ -43,6 +43,8 @@ docker run -d \ export OXAPI_URL='http://0.0.0.0:8888' # used by oxapi_demo +sleep 20 # things take time to spin up sometimes + # Populate API data. oxapi_demo organization_create_demo maze-war From 8b85cb0857cac6ee86d9cc6cce19877fe83e0703 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 16:42:11 +0000 Subject: [PATCH 08/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index 9e94be1351..6020cd2dcb 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643260632 \ + --image=packer-1643301226 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From 81127b64b9bf4404b503492dd15006c5dcff7bc3 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Thu, 27 Jan 2022 12:55:20 -0500 Subject: [PATCH 09/21] update API again to get new log line --- .github/workflows/packer.yaml | 2 +- libs/api/__generated__/OMICRON_VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index ed1caa89af..8dcf524692 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -75,7 +75,7 @@ jobs: CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}} SSL_CERT: ${{secrets.SSL_CERT}} SSL_KEY: ${{secrets.SSL_KEY}} - API_VERSION: ec222df9b28e39346424ba1fe190bc56580b2453 + API_VERSION: 98f2059f8e5613891b1d13201b717e5841bdaa03 # get the image information from gcloud - name: Get image information diff --git a/libs/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION index a4fa69407f..9d48503b1e 100644 --- a/libs/api/__generated__/OMICRON_VERSION +++ b/libs/api/__generated__/OMICRON_VERSION @@ -1,2 +1,2 @@ # generated file. do not update manually. see docs/update-pinned-api.md -ec222df9b28e39346424ba1fe190bc56580b2453 +98f2059f8e5613891b1d13201b717e5841bdaa03 From db56890063ac0c313500a4a12992996f11781992 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 18:05:00 +0000 Subject: [PATCH 10/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index 6020cd2dcb..90f30dc578 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643301226 \ + --image=packer-1643306202 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From 5a792b83aa52508d0a1a54f9664b8805a8e60c7e Mon Sep 17 00:00:00 2001 From: David Crespo Date: Thu, 27 Jan 2022 14:04:56 -0500 Subject: [PATCH 11/21] again --- .github/workflows/packer.yaml | 2 +- libs/api/__generated__/OMICRON_VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index 8dcf524692..97ee1ba171 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -75,7 +75,7 @@ jobs: CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}} SSL_CERT: ${{secrets.SSL_CERT}} SSL_KEY: ${{secrets.SSL_KEY}} - API_VERSION: 98f2059f8e5613891b1d13201b717e5841bdaa03 + API_VERSION: 0a560243a5e5a1d87fa79c8824b1198f5f61224c # get the image information from gcloud - name: Get image information diff --git a/libs/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION index 9d48503b1e..13fcd500bb 100644 --- a/libs/api/__generated__/OMICRON_VERSION +++ b/libs/api/__generated__/OMICRON_VERSION @@ -1,2 +1,2 @@ # generated file. do not update manually. see docs/update-pinned-api.md -98f2059f8e5613891b1d13201b717e5841bdaa03 +0a560243a5e5a1d87fa79c8824b1198f5f61224c From d2af36df7abb185808f7a94f2dd0291e2d2dfa95 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 19:14:13 +0000 Subject: [PATCH 12/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index 90f30dc578..0de0540293 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643306202 \ + --image=packer-1643310379 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From d65720aceaff24484b19f3bc79abd0760eb6a190 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Thu, 27 Jan 2022 15:09:55 -0500 Subject: [PATCH 13/21] again again --- .github/workflows/packer.yaml | 2 +- libs/api/__generated__/OMICRON_VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index 97ee1ba171..e99b17da15 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -75,7 +75,7 @@ jobs: CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}} SSL_CERT: ${{secrets.SSL_CERT}} SSL_KEY: ${{secrets.SSL_KEY}} - API_VERSION: 0a560243a5e5a1d87fa79c8824b1198f5f61224c + API_VERSION: 908599d1b7f017197ffc34d8961dec034d9badac # get the image information from gcloud - name: Get image information diff --git a/libs/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION index 13fcd500bb..a9ad8ed69f 100644 --- a/libs/api/__generated__/OMICRON_VERSION +++ b/libs/api/__generated__/OMICRON_VERSION @@ -1,2 +1,2 @@ # generated file. do not update manually. see docs/update-pinned-api.md -0a560243a5e5a1d87fa79c8824b1198f5f61224c +908599d1b7f017197ffc34d8961dec034d9badac From fb29939a6005d2a4397c3deb4f474af6bcde662d Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 21:30:23 +0000 Subject: [PATCH 14/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index 0de0540293..9aefe8da3e 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643310379 \ + --image=packer-1643318551 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From 85f2b09e9e1d2f0ddcd4dc8d0a95fc5bfe63090a Mon Sep 17 00:00:00 2001 From: David Crespo Date: Thu, 27 Jan 2022 17:14:59 -0500 Subject: [PATCH 15/21] update for dockerfil with no cmd --- .github/workflows/packer.yaml | 2 +- libs/api/__generated__/OMICRON_VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index e99b17da15..18589f4981 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -75,7 +75,7 @@ jobs: CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}} SSL_CERT: ${{secrets.SSL_CERT}} SSL_KEY: ${{secrets.SSL_KEY}} - API_VERSION: 908599d1b7f017197ffc34d8961dec034d9badac + API_VERSION: 015596c97a6a7c6bcdcaf9a543a4bbc51c2374b8 # get the image information from gcloud - name: Get image information diff --git a/libs/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION index a9ad8ed69f..b6fc7af193 100644 --- a/libs/api/__generated__/OMICRON_VERSION +++ b/libs/api/__generated__/OMICRON_VERSION @@ -1,2 +1,2 @@ # generated file. do not update manually. see docs/update-pinned-api.md -908599d1b7f017197ffc34d8961dec034d9badac +015596c97a6a7c6bcdcaf9a543a4bbc51c2374b8 From 5db1c9b3c3bba928f284b9249d6dce31b141c3cb Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 22:24:06 +0000 Subject: [PATCH 16/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index 9aefe8da3e..4c44e1d8ba 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643318551 \ + --image=packer-1643321755 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From bcc9edea83060bfbfa76f7a7f55e619e16e1f266 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Thu, 27 Jan 2022 17:38:01 -0500 Subject: [PATCH 17/21] Revert "automatically update packer-id" 5db1c9b3c3bba928f284b9249d6dce31b141c3cb --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index 4c44e1d8ba..9aefe8da3e 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643321755 \ + --image=packer-1643318551 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From 53b959691bf8ef02f6761c51b8c310ab0f1d3db4 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Thu, 27 Jan 2022 17:38:05 -0500 Subject: [PATCH 18/21] Revert "update for dockerfil with no cmd" 85f2b09e9e1d2f0ddcd4dc8d0a95fc5bfe63090a --- .github/workflows/packer.yaml | 2 +- libs/api/__generated__/OMICRON_VERSION | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index 18589f4981..e99b17da15 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -75,7 +75,7 @@ jobs: CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}} SSL_CERT: ${{secrets.SSL_CERT}} SSL_KEY: ${{secrets.SSL_KEY}} - API_VERSION: 015596c97a6a7c6bcdcaf9a543a4bbc51c2374b8 + API_VERSION: 908599d1b7f017197ffc34d8961dec034d9badac # get the image information from gcloud - name: Get image information diff --git a/libs/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION index b6fc7af193..a9ad8ed69f 100644 --- a/libs/api/__generated__/OMICRON_VERSION +++ b/libs/api/__generated__/OMICRON_VERSION @@ -1,2 +1,2 @@ # generated file. do not update manually. see docs/update-pinned-api.md -015596c97a6a7c6bcdcaf9a543a4bbc51c2374b8 +908599d1b7f017197ffc34d8961dec034d9badac From cf58ef04fbd234cac83b355f594ac4b27bcf591c Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 27 Jan 2022 22:46:53 +0000 Subject: [PATCH 19/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index 9aefe8da3e..a4ee65ce8e 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643318551 \ + --image=packer-1643323131 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \ From f7d316a5afe039c53cef7e37cb0e78b6b966d727 Mon Sep 17 00:00:00 2001 From: David Crespo Date: Mon, 31 Jan 2022 10:34:31 -0500 Subject: [PATCH 20/21] update to latest main, let's just be done --- .github/workflows/packer.yaml | 2 +- libs/api/__generated__/OMICRON_VERSION | 2 +- tools/gcp_instance_startup_script.sh | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/packer.yaml b/.github/workflows/packer.yaml index e99b17da15..5d1f20455d 100644 --- a/.github/workflows/packer.yaml +++ b/.github/workflows/packer.yaml @@ -75,7 +75,7 @@ jobs: CLOUDFLARE_TOKEN: ${{secrets.CLOUDFLARE_TOKEN}} SSL_CERT: ${{secrets.SSL_CERT}} SSL_KEY: ${{secrets.SSL_KEY}} - API_VERSION: 908599d1b7f017197ffc34d8961dec034d9badac + API_VERSION: c4e76cb01fa791c4dc9722072800c8969397aa03 # get the image information from gcloud - name: Get image information diff --git a/libs/api/__generated__/OMICRON_VERSION b/libs/api/__generated__/OMICRON_VERSION index a9ad8ed69f..6f9fadd6e8 100644 --- a/libs/api/__generated__/OMICRON_VERSION +++ b/libs/api/__generated__/OMICRON_VERSION @@ -1,2 +1,2 @@ # generated file. do not update manually. see docs/update-pinned-api.md -908599d1b7f017197ffc34d8961dec034d9badac +c4e76cb01fa791c4dc9722072800c8969397aa03 diff --git a/tools/gcp_instance_startup_script.sh b/tools/gcp_instance_startup_script.sh index d80df050e9..290aefd606 100755 --- a/tools/gcp_instance_startup_script.sh +++ b/tools/gcp_instance_startup_script.sh @@ -43,8 +43,6 @@ docker run -d \ export OXAPI_URL='http://0.0.0.0:8888' # used by oxapi_demo -sleep 20 # things take time to spin up sometimes - # Populate API data. oxapi_demo organization_create_demo maze-war From 239e4715043ae57650f1de023bd3262d73fec11e Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 31 Jan 2022 15:43:09 +0000 Subject: [PATCH 21/21] automatically update packer-id --- tools/create_gcp_instance.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/create_gcp_instance.sh b/tools/create_gcp_instance.sh index a4ee65ce8e..24a4cca3f5 100755 --- a/tools/create_gcp_instance.sh +++ b/tools/create_gcp_instance.sh @@ -41,7 +41,7 @@ retry 2 gcloud compute instances create "$INSTANCE_NAME" \ --description="Machine automatically generated from branch ${BRANCH_NAME} of the oxidecomputer/console git repo." \ --hostname="${INSTANCE_NAME}.internal.oxide.computer" \ --zone=$ZONE \ - --image=packer-1643323131 \ + --image=packer-1643643314 \ --maintenance-policy=TERMINATE \ --restart-on-failure \ --machine-type=$INSTANCE_TYPE \