Update workflows and Prometheus annotations

sweetrpg · Oct 26, 2024 · 237e690 · 237e690
1 parent 314db7b
commit 237e690
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 95 deletions.
diff --git a/.github/workflows/python-ci.yml → .github/workflows/go-ci.yml b/.github/workflows/python-ci.yml → .github/workflows/go-ci.yml
@@ -1,12 +1,15 @@
-name: Go CI
+name: CI
 
 concurrency: ci-${{ github.ref }}
 
 on:
     push:
         branches: [develop]
         paths:
-            - "src/**"
+            - "**/*.go"
+            - go.mod
+            - go.sum
+            - .go-version
     workflow_dispatch:
 
 jobs:
@@ -19,13 +22,23 @@ jobs:
                 include:
                     - {
                           name: Linux,
-                          python: "1.23",
                           os: ubuntu-latest,
                       }
         steps:
             - uses: actions/checkout@v4
-            - name: tests
-              run: echo "TODO"
+            - name: Get swift version
+              id: get_lang_version
+              run: |
+                    v=$(cat .go-version)
+                    echo "go_version=$v" >> $GITHUB_OUTPUT
+            - name: Set up Go
+              uses: actions/setup-go@v4
+              with:
+                go-version: ${{ steps.get_lang_version.outputs.go_version }}
+            - name: Build
+              run: go build -v ./...
+            - name: Test
+              run: go test -v ./...
 
     #    docs:
     #        needs: [tests]

diff --git a/.github/workflows/go-pr.yml b/.github/workflows/go-pr.yml
@@ -0,0 +1,40 @@
+name: PR
+
+concurrency: pr-${{ github.ref }}
+
+on:
+    pull_request:
+        branches: [develop]
+        paths:
+            - "**/*.go"
+            - go.mod
+            - go.sum
+            - .go-version
+
+jobs:
+    tests:
+        name: ${{ matrix.name }}
+        runs-on: ${{ matrix.os }}
+        strategy:
+            fail-fast: false
+            matrix:
+                include:
+                    - {
+                          name: Linux,
+                          os: ubuntu-latest,
+                      }
+        steps:
+            - uses: actions/checkout@v4
+            - name: Get swift version
+              id: get_lang_version
+              run: |
+                    v=$(cat .go-version)
+                    echo "go_version=$v" >> $GITHUB_OUTPUT
+            - name: Set up Go
+              uses: actions/setup-go@v4
+              with:
+                go-version: ${{ steps.get_lang_version.outputs.go_version }}
+            - name: Build
+              run: go build -v ./...
+            - name: Test
+              run: go test -v ./...
diff --git a/.github/workflows/python-pr.yml b/.github/workflows/python-pr.yml
diff --git a/.github/workflows/python-update-reqs.yml b/.github/workflows/python-update-reqs.yml
diff --git a/cmd/catalog-api/main.go b/cmd/catalog-api/main.go
@@ -43,7 +43,7 @@ func main() {
 	tracing.SetupTracing()
 	defer tracing.TeardownTracing()
 
-	// get global Monitor object
+	// Setup Prometheus metrics
 	m := ginmetrics.GetMonitor()
 	m.SetMetricPath("/metrics")
 	m.SetSlowTime(10)

diff --git a/kubernetes/base/deployment.yaml b/kubernetes/base/deployment.yaml
@@ -26,6 +26,10 @@ spec:
                 package: catalog
                 component: api
                 version: v1
+            annotations:
+                prometheus.io/scrape: "true"
+                prometheus.io/path: '/metrics'
+                prometheus.io/port: '8000'
         spec:
             serviceAccountName: api
             imagePullSecrets: