fix: priority and resources

awakari · Sep 20, 2024 · 933bf5d · 933bf5d
1 parent bd529af
commit 933bf5d
Show file tree

Hide file tree

Showing 17 changed files with 50 additions and 38 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.0-alpine3.20 AS builder
+FROM golang:1.23.1-alpine3.20 AS builder
 WORKDIR /go/src/int-mastodon
 COPY . .
 RUN \

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ COVERAGE_TMP_FILE_NAME=cover.tmp
 
 proto:
 	go install github.com/golang/protobuf/protoc-gen-go@latest
-	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.4.0
+	go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@v1.5.1
 	PATH=${PATH}:~/go/bin protoc --go_out=plugins=grpc:. --go_opt=paths=source_relative \
 		api/grpc/*.proto \
 		api/grpc/int-activitypub/*.proto \

diff --git a/go.mod b/go.mod
@@ -11,18 +11,18 @@ require (
 	github.com/r3labs/sse/v2 v2.10.0
 	github.com/segmentio/ksuid v1.0.4
 	github.com/stretchr/testify v1.9.0
-	google.golang.org/grpc v1.66.0
+	google.golang.org/grpc v1.67.0
 	google.golang.org/protobuf v1.34.2
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.24.0 // indirect
-	golang.org/x/text v0.17.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed // indirect
+	golang.org/x/net v0.29.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -32,39 +32,18 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/net v0.0.0-20191116160921-f9c825593386/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.26.0 h1:soB7SVo0PWrY4vPW/+ay0jKDNScG2X9wFeYlXIvJsOQ=
-golang.org/x/net v0.26.0/go.mod h1:5YKkiSynbBIh3p6iOc/vibscux0x38BZDkn8sCUPxHE=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
-golang.org/x/net v0.28.0 h1:a9JDOJc5GMUJ0+UDqmLT86WiEy7iWyIhz8gz8E4e5hE=
-golang.org/x/net v0.28.0/go.mod h1:yqtgsTWOOnlGLG9GFRrK3++bGOUEkNBoHZc8MEDWPNg=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
-golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.23.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
-golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
-golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
-golang.org/x/text v0.17.0 h1:XtiM5bkSOt+ewxlOE/aE/AKEHibwj/6gvWMl9Rsh0Qc=
-golang.org/x/text v0.17.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 h1:BwIjyKYGsK9dMCBOorzRri8MQwmi7mT9rGHsCEinZkA=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f h1:RARaIm8pxYuxyNPbBQf5igT7XdOyCNtat1qAT2ZxjU4=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240725223205-93522f1f2a9f/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf h1:liao9UHurZLtiEwBgT9LMOnKYsHze6eA6w1KQCMVN2Q=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240730163845-b1a4ccb954bf/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a h1:EKiZZXueP9/T68B8Nl0GAx9cjbQnCId0yP3qPMgaaHs=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240808171019-573a1156607a/go.mod h1:Ue6ibwXGpU+dqIcODieyLOcgj7z8+IcskoNIgZxtrFY=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed h1:J6izYgfBXAI3xTKLgxzTmUltdYaLsuBxFCgDHWJ/eXg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20240827150818-7e3bb234dfed/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
-google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
-google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
-google.golang.org/grpc v1.66.0 h1:DibZuoBznOxbDQxRINckZcUvnCEvrW9pcWIE2yF9r1c=
-google.golang.org/grpc v1.66.0/go.mod h1:s3/l6xSSCURdVfAnL+TqCNMyTDAGN6+lZeVxnZR128Y=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 h1:pPJltXNxVzT4pK9yD8vR9X75DaWYYmLGMsEvBfFQZzQ=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1/go.mod h1:UqMtugtsSgubUsoxbuAoiCXvqvErP7Gf0so0mK9tHxU=
+google.golang.org/grpc v1.67.0 h1:IdH9y6PF5MPSdAntIcpjQ+tXO41pcQsfZV2RxtQgVcw=
+google.golang.org/grpc v1.67.0/go.mod h1:1gLDyUQU7CTLJI90u3nXZ9ekeghjeM7pTDZlqFNg2AA=
 google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
 google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
 gopkg.in/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y=

diff --git a/helm/int-mastodon/templates/deployment.yaml b/helm/int-mastodon/templates/deployment.yaml
@@ -27,6 +27,7 @@ spec:
       serviceAccountName: {{ include "int-mastodon.serviceAccountName" . }}
       securityContext:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
+      priorityClassName: "{{ .Values.priority.class }}"
       containers:
         - name: {{ .Chart.Name }}
           env:

diff --git a/helm/int-mastodon/values-botsin-space-0.yaml b/helm/int-mastodon/values-botsin-space-0.yaml
@@ -10,3 +10,5 @@ queue:
     name: "int-mastodon-botsin-space"
   interestsUpdated:
     name: "int-mastodon-botsin-space"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-c-im.yaml b/helm/int-mastodon/values-c-im.yaml
@@ -1,3 +1,4 @@
+replicaCount: 0
 mastodon:
   endpoint:
     accounts: "https://c.im/api/v1/accounts"
@@ -8,3 +9,5 @@ queue:
     name: "int-mastodon-c-im"
   interestsUpdated:
     name: "int-mastodon-c-im"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-flipboard-social-0.yaml b/helm/int-mastodon/values-flipboard-social-0.yaml
@@ -1,3 +1,4 @@
+replicaCount: 0
 mastodon:
   endpoint:
     accounts: "https://flipboard.social/api/v1/accounts"
@@ -10,3 +11,5 @@ queue:
     name: "int-mastodon-flipboard-social"
   interestsUpdated:
     name: "int-mastodon-flipboard-social"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-hachyderm-io.yaml b/helm/int-mastodon/values-hachyderm-io.yaml
@@ -1,3 +1,4 @@
+replicaCount: 0
 mastodon:
   endpoint:
     accounts: "https://hachyderm.io/api/v1/accounts"
@@ -8,3 +9,5 @@ queue:
     name: "int-mastodon-hachyderm-io"
   interestsUpdated:
     name: "int-mastodon-hachyderm-io"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-infosec-exchange-0.yaml b/helm/int-mastodon/values-infosec-exchange-0.yaml
@@ -1,3 +1,4 @@
+replicaCount: 0
 mastodon:
   endpoint:
     accounts: "https://infosec.exchange/api/v1/accounts"
@@ -10,3 +11,5 @@ queue:
     name: "int-mastodon-infosec-exchange"
   interestsUpdated:
     name: "int-mastodon-infosec-exchange"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-mastodon-cloud-0.yaml b/helm/int-mastodon/values-mastodon-cloud-0.yaml
@@ -1,3 +1,4 @@
+replicaCount: 0
 mastodon:
   endpoint:
     accounts: "https://mastodon.cloud/api/v1/accounts"
@@ -10,3 +11,5 @@ queue:
     name: "int-mastodon-mastodon-cloud"
   interestsUpdated:
     name: "int-mastodon-mastodon-cloud"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-mastodon-social-0.yaml b/helm/int-mastodon/values-mastodon-social-0.yaml
@@ -8,3 +8,5 @@ queue:
     name: "int-mastodon-mastodon-social"
   interestsUpdated:
     name: "int-mastodon-mastodon-social"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-mastodon-uno.yaml b/helm/int-mastodon/values-mastodon-uno.yaml
@@ -1,3 +1,4 @@
+replicaCount: 0
 mastodon:
   endpoint:
     accounts: "https://mastodon.uno/api/v1/accounts"
@@ -8,3 +9,5 @@ queue:
     name: "int-mastodon-mastodon-uno"
   interestsUpdated:
     name: "int-mastodon-mastodon-uno"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-mastodon-world.yaml b/helm/int-mastodon/values-mastodon-world.yaml
@@ -8,3 +8,5 @@ queue:
     name: "int-mastodon-mastodon-world"
   interestsUpdated:
     name: "int-mastodon-mastodon-world"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-mstdn-jp.yaml b/helm/int-mastodon/values-mstdn-jp.yaml
@@ -10,3 +10,5 @@ queue:
     name: "int-mastodon-mstdn-jp"
   interestsUpdated:
     name: "int-mastodon-mstdn-jp"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-mstdn-social-0.yaml b/helm/int-mastodon/values-mstdn-social-0.yaml
@@ -1,3 +1,4 @@
+replicaCount: 0
 mastodon:
   endpoint:
     accounts: "https://mstdn.social/api/v1/accounts"
@@ -10,3 +11,5 @@ queue:
     name: "int-mastodon-mstdn-social"
   interestsUpdated:
     name: "int-mastodon-mstdn-social"
+priority:
+  class: "awk-major"
diff --git a/helm/int-mastodon/values-techhub-social-0.yaml b/helm/int-mastodon/values-techhub-social-0.yaml
@@ -1,3 +1,4 @@
+replicaCount: 0
 mastodon:
   endpoint:
     accounts: "https://techhub.social/api/v1/accounts"
@@ -10,3 +11,5 @@ queue:
     name: "int-mastodon-techhub-social"
   interestsUpdated:
     name: "int-mastodon-techhub-social"
+priority:
+  class: "awk-major"