init

awakari · Dec 9, 2024 · 4a83c29 · 4a83c29
1 parent 74cbf90
commit 4a83c29
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/api/http/pub/handler.go b/api/http/pub/handler.go
@@ -3,7 +3,7 @@ package pub
 import (
 	"github.com/awakari/pub/api/grpc/events"
 	"github.com/awakari/pub/api/grpc/publisher"
-	grpc2 "github.com/awakari/pub/api/http/grpc"
+	"github.com/awakari/pub/api/http/grpc"
 	"github.com/awakari/pub/config"
 	"github.com/awakari/pub/model"
 	"github.com/cloudevents/sdk-go/binding/format/protobuf/v2/pb"
@@ -68,7 +68,7 @@ func (h handler) WriteInternal(ctx *gin.Context) {
 }
 
 func (h handler) write(ctx *gin.Context, evt *pb.CloudEvent, internal bool) {
-	grpcCtx, groupId, userId := grpc2.AuthRequestContext(ctx)
+	grpcCtx, groupId, userId := grpc.AuthRequestContext(ctx)
 	conn, err := h.connPoolEvts.Get(ctx)
 	var streamClient events.Service_PublishClient
 	if err == nil {
@@ -112,5 +112,5 @@ func (h handler) write(ctx *gin.Context, evt *pb.CloudEvent, internal bool) {
 	if err == nil && resp.AckCount == 0 {
 		err = status.Error(codes.Unavailable, "was unable to submit, retry later")
 	}
-	grpc2.RespondJson(ctx, resp, err)
+	grpc.RespondJson(ctx, resp, err)
 }
diff --git a/helm/pub/templates/ingress.yaml b/helm/pub/templates/ingress.yaml
@@ -26,6 +26,10 @@ metadata:
     nginx.ingress.kubernetes.io/limit-rps: "{{ .Values.ingress.limit.rate.second }}"
     nginx.ingress.kubernetes.io/limit-rpm: "{{ .Values.ingress.limit.rate.second }}"
     nginx.ingress.kubernetes.io/limit-connections: "{{ .Values.ingress.limit.connections }}"
+    nginx.ingress.kubernetes.io/enable-cors: "true"
+    nginx.ingress.kubernetes.io/cors-allow-origin: "{{ .Values.ingress.corsAllowOrigin }}"
+    nginx.ingress.kubernetes.io/cors-allow-methods: "HEAD, OPTIONS, GET, POST, DELETE"
+    nginx.ingress.kubernetes.io/cors-allow-headers: "DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,Authorization,X-Awakari-Group-Id,X-Awakari-User-Id,X-Awakari-Src-Addr"
 spec:
   {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
   ingressClassName: {{ .Values.ingress.className }}

diff --git a/helm/pub/values-awakari-com.yaml b/helm/pub/values-awakari-com.yaml
@@ -1,4 +1,5 @@
 ingress:
+  corsAllowOrigin: "https://awakari.com"
   hosts:
     - host: pub.awakari.com
       paths:

diff --git a/helm/pub/values.yaml b/helm/pub/values.yaml
@@ -42,6 +42,7 @@ service:
 
 ingress:
   enabled: true
+  corsAllowOrigin: "https://awakari.com"
   # limits are per source IP address
   limit:
     connections: 1000