From a7f8f73492576348579745923435899f9748cb9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= Date: Wed, 17 Jan 2024 15:42:31 +0000 Subject: [PATCH 1/5] Update Runway version and settings --- .gitlab-ci.yml | 6 ++++-- .runway/env-production.yml | 2 -- .runway/env-staging.yml | 2 -- .runway/runway.yml | 8 +++++++- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index afda850..13e6b72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,8 @@ variables: # The Go and alpine versions should match the ones used for building the production image in Dockerfile GO_VERSION: "1.21" ALPINE_VERSION: "alpine3.18" + # Available Runway versions at https://gitlab.com/gitlab-com/gl-infra/platform/runway/ci-tasks/-/tags + RUNWAY_VERSION: &RUNWAY_VERSION v1.19.0 # https://gitlab.com/gitlab-org/gitlab/-/issues/219065#note_1388859457 include: # https://docs.gitlab.com/ee/user/application_security/sast/ @@ -15,12 +17,12 @@ include: - template: Workflows/MergeRequest-Pipelines.gitlab-ci.yml # https://gitlab.com/gitlab-com/gl-infra/platform/runway/ci-tasks - project: 'gitlab-com/gl-infra/platform/runway/ci-tasks' - ref: v1.14.2 + ref: *RUNWAY_VERSION file: 'service-project/runway.yml' inputs: runway_service_id: glgo image: $CI_IMAGE - runway_version: v1.14.2 + runway_version: *RUNWAY_VERSION stages: - verify diff --git a/.runway/env-production.yml b/.runway/env-production.yml index 9a4ec6a..12a2909 100644 --- a/.runway/env-production.yml +++ b/.runway/env-production.yml @@ -1,5 +1,3 @@ -GITLAB_URL: "https://gitlab.com" -GITLAB_API_URL: "https://gitlab.com/api/v4/" GLGO_IDENTITY_ISSUER: "https://auth.gcp.gitlab.com" # GLGO_KNOWN_ISSUERS is a comma separated list of ; pairs GLGO_KNOWN_ISSUERS: "https://gitlab.com;https://gitlab.com/oauth/discovery/keys" \ No newline at end of file diff --git a/.runway/env-staging.yml b/.runway/env-staging.yml index f82e935..61c04ad 100644 --- a/.runway/env-staging.yml +++ b/.runway/env-staging.yml @@ -1,5 +1,3 @@ -GITLAB_URL: "https://staging.gitlab.com" -GITLAB_API_URL: "https://staging.gitlab.com/api/v4/" GLGO_IDENTITY_ISSUER: "https://glgo.staging.runway.gitlab.net" # GLGO_KNOWN_ISSUERS is a comma separated list of ; pairs GLGO_KNOWN_ISSUERS: "https://staging.gitlab.com;https://staging.gitlab.com/oauth/discovery/keys" \ No newline at end of file diff --git a/.runway/runway.yml b/.runway/runway.yml index 0ca29ec..cd7e13e 100644 --- a/.runway/runway.yml +++ b/.runway/runway.yml @@ -1,10 +1,16 @@ +# https://gitlab-com.gitlab.io/gl-infra/platform/runway/runwayctl/manifest.schema.html apiVersion: runway/v1.0.0-beta kind: RunwayService metadata: name: glgo - owner: grzesiek + owner_email_handle: grzesiek spec: image: "${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHORT_SHA}" + startup_probe: + path: "/health" + liveness_probe: + path: "/health" + # https://gitlab.com/gitlab-com/gl-infra/platform/runway/docs/-/blob/master/scalability.md scalability: min_instances: 0 resources: -- GitLab From 009edd5adb882d6d965038facf2f08f49638a833 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= Date: Wed, 17 Jan 2024 15:43:37 +0000 Subject: [PATCH 2/5] Update Runway version and settings --- .gitlab-ci.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 13e6b72..4ed7d7e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: GO_VERSION: "1.21" ALPINE_VERSION: "alpine3.18" # Available Runway versions at https://gitlab.com/gitlab-com/gl-infra/platform/runway/ci-tasks/-/tags - RUNWAY_VERSION: &RUNWAY_VERSION v1.19.0 # https://gitlab.com/gitlab-org/gitlab/-/issues/219065#note_1388859457 include: # https://docs.gitlab.com/ee/user/application_security/sast/ @@ -17,12 +16,12 @@ include: - template: Workflows/MergeRequest-Pipelines.gitlab-ci.yml # https://gitlab.com/gitlab-com/gl-infra/platform/runway/ci-tasks - project: 'gitlab-com/gl-infra/platform/runway/ci-tasks' - ref: *RUNWAY_VERSION + ref: v1.19.0 file: 'service-project/runway.yml' inputs: runway_service_id: glgo image: $CI_IMAGE - runway_version: *RUNWAY_VERSION + runway_version: v1.19.0 stages: - verify -- GitLab From 7441ba6fa333a81b29daf9116c2f234b0a7ad578 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= Date: Wed, 17 Jan 2024 15:47:32 +0000 Subject: [PATCH 3/5] Change version --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ed7d7e..52b5108 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,6 +4,7 @@ variables: GO_VERSION: "1.21" ALPINE_VERSION: "alpine3.18" # Available Runway versions at https://gitlab.com/gitlab-com/gl-infra/platform/runway/ci-tasks/-/tags + RUNWAY_VERSION: &RUNWAY_VERSION v1.14.2 # workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/219065 include: # https://docs.gitlab.com/ee/user/application_security/sast/ @@ -16,12 +17,12 @@ include: - template: Workflows/MergeRequest-Pipelines.gitlab-ci.yml # https://gitlab.com/gitlab-com/gl-infra/platform/runway/ci-tasks - project: 'gitlab-com/gl-infra/platform/runway/ci-tasks' - ref: v1.19.0 + ref: *RUNWAY_VERSION file: 'service-project/runway.yml' inputs: runway_service_id: glgo image: $CI_IMAGE - runway_version: v1.19.0 + runway_version: *RUNWAY_VERSION stages: - verify -- GitLab From 34c1f80f425e3003c81c048ae3146b777c59f3da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= Date: Wed, 17 Jan 2024 15:49:58 +0000 Subject: [PATCH 4/5] Change version --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 52b5108..c77c517 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,7 @@ variables: GO_VERSION: "1.21" ALPINE_VERSION: "alpine3.18" # Available Runway versions at https://gitlab.com/gitlab-com/gl-infra/platform/runway/ci-tasks/-/tags - RUNWAY_VERSION: &RUNWAY_VERSION v1.14.2 # workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/219065 + RUNWAY_VERSION: &RUNWAY_VERSION v1.19.0 # workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/219065 include: # https://docs.gitlab.com/ee/user/application_security/sast/ -- GitLab From 6b08ededc1a4d7d31cda0837f6b7ba7a25b1f217 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Pereira?= Date: Wed, 17 Jan 2024 15:52:30 +0000 Subject: [PATCH 5/5] Fix CI --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c77c517..72ddc0e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,7 +3,6 @@ variables: # The Go and alpine versions should match the ones used for building the production image in Dockerfile GO_VERSION: "1.21" ALPINE_VERSION: "alpine3.18" - # Available Runway versions at https://gitlab.com/gitlab-com/gl-infra/platform/runway/ci-tasks/-/tags RUNWAY_VERSION: &RUNWAY_VERSION v1.19.0 # workaround for https://gitlab.com/gitlab-org/gitlab/-/issues/219065 include: @@ -28,7 +27,8 @@ stages: - verify - test - build - - runway + - runway_staging + - runway_production .scanners: &scanners stage: verify -- GitLab