Merge branch 'agntcy:main' into main

Author: rayl15

.github/workflows/buf-ci.yaml

@@ -0,0 +1,21 @@
+# Copyright AGNTCY Contributors (https://github.com/agntcy)
+# SPDX-License-Identifier: Apache-2.0
+
+name: Buf CI
+on:
+  push:
+  pull_request:
+    types: [opened, synchronize, reopened, labeled, unlabeled]
+  delete:
+permissions:
+  contents: read
+  pull-requests: write
+jobs:
+  buf:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: bufbuild/buf-action@v1
+        with:
+          token: ${{ secrets.BUF_TOKEN }}
+          input: proto

.github/workflows/reusable-release.yaml

@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
         with:
           fetch-depth: 0
 
@@ -43,7 +43,7 @@ jobs:
         run: sh -c "$(curl --location https://taskfile.dev/install.sh)" -- -d -b ~/.local/bin
 
       - name: Download artifacts
-        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806 # v4.1.9
+        uses: actions/download-artifact@cc203385981b70ca67e1cc392babf9cc229d5806  # v4.1.9
         with:
           name: ${{ inputs.artifact_path }}
           path: artifacts
@@ -78,7 +78,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
+        uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938  # v4.2.0
         with:
           fetch-depth: 0
 
@@ -90,7 +90,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN  }}
 
       - name: Setup Helm
-        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
+        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814  # v4.2.0
         with:
           version: ${{ inputs.helm-version }}
 
@@ -131,7 +131,7 @@ jobs:
         id: create_release
         uses: actions/create-release@v1
         env:
-          GITHUB_TOKEN : ${{ secrets.GITHUB_TOKEN  }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN  }}
         with:
           tag_name: ${{ inputs.release_tag }}
           release_name: Release ${{ inputs.release_tag }}

.gitignore

@@ -6,3 +6,7 @@ bin/
 
 # Env config
 .env
+
+# IDEs
+.idea/
+.DS_Store

README.md

@@ -116,11 +116,19 @@ including ephemeral Kind clusters and Docker containers.
 task down
 ```
 
-## Artifacts distribution
+## Distribution
+
+### Artifacts
 
 See https://github.com/orgs/agntcy/packages?repo_name=oasf
 
-## Copyright Notice
+### Protocol buffer definitions
+
+The `proto` directory contains the Protocol Buffer (`.proto`) files defining our data objects and APIs. The full proto
+module, generated language stubs and it's versions are hosted at the Buf Schema Registry:
+[https://buf.build/agntcy/oasf](https://buf.build/agntcy/oasf)
+
+## Copyright notice
 
 [Copyright Notice and License](./LICENSE.md)
 

install/charts/oasf/Chart.yaml

@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/).
-version: 0.1.0
+version: 0.1.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

install/charts/oasf/templates/ingress/ingress-api.yaml

@@ -22,7 +22,7 @@ metadata:
   labels:
     {{- include "chart.labels" . | nindent 4 }}
   annotations:
-  {{- if eq .Values.ingress.className "nginx" }}
+  {{- if or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "nginx-internal") }}
     nginx.ingress.kubernetes.io/rewrite-target: /api/$2
     nginx.ingress.kubernetes.io/use-regex: "true"
   {{- end }}

install/charts/oasf/templates/ingress/ingress-configmap.yaml

@@ -6,7 +6,6 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: nginx-configuration
-  namespace: default
 data:
   proxy-body-size: "64m"
 {{- end }}

install/charts/oasf/templates/ingress/ingress-default.yaml

@@ -0,0 +1,63 @@
+# Copyright AGNTCY Contributors (https://github.com/agntcy)
+# SPDX-License-Identifier: Apache-2.0
+
+{{- if .Values.ingress.enabled -}}
+{{- $fullName := include "chart.fullname" . -}}
+{{- $svcPort := .Values.service.port -}}
+{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
+  {{- if not (hasKey .Values.ingress.annotations "kubernetes.io/ingress.class") }}
+  {{- $_ := set .Values.ingress.annotations "kubernetes.io/ingress.class" .Values.ingress.className }}
+  {{- end }}
+{{- end }}
+{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1
+{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion }}
+apiVersion: networking.k8s.io/v1beta1
+{{- else }}
+apiVersion: extensions/v1beta1
+{{- end }}
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-default
+  labels:
+    {{- include "chart.labels" . | nindent 4 }}
+  annotations:
+  {{- if or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "nginx-internal") }}
+    nginx.ingress.kubernetes.io/rewrite-target: /$1
+    nginx.ingress.kubernetes.io/use-regex: "true"
+  {{- end }}
+  {{- with .Values.ingress.annotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+  {{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+  ingressClassName: {{ .Values.ingress.className }}
+  {{- end }}
+  {{- if .Values.ingress.tls }}
+  tls:
+    {{- range .Values.ingress.tls }}
+    - hosts:
+        {{- range .hosts }}
+        - {{ . | quote }}
+        {{- end }}
+      secretName: {{ .secretName }}
+    {{- end }}
+  {{- end }}
+  rules:
+    {{- range .Values.ingress.hosts }}
+    - host: {{ .host | quote }}
+      http:
+        paths:
+          {{- range $index, $version := $.Values.image.versions }}
+            {{- if $version.default }}
+          - path: /(.*)
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: {{ $fullName }}-{{ $version.schema | replace "." "-" }}
+                port:
+                  number: {{ $svcPort }}
+            {{- end }}
+          {{- end }}
+    {{- end }}
+{{- end }}

install/charts/oasf/templates/ingress/ingress-doc.yaml

@@ -22,7 +22,7 @@ metadata:
   labels:
     {{- include "chart.labels" . | nindent 4 }}
   annotations:
-  {{- if eq .Values.ingress.className "nginx" }}
+  {{- if or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "nginx-internal") }}
     nginx.ingress.kubernetes.io/use-regex: "false"
   {{- end }}
   {{- with .Values.ingress.annotations }}
@@ -49,15 +49,15 @@ spec:
         paths:
           {{- range $index, $version := $.Values.image.versions }}
           - path: /{{ $version.schema }}/doc
-            pathType: Prefix
+            pathType: ImplementationSpecific
             backend:
               service:
                 name: {{ $fullName }}-{{ $version.schema | replace "." "-" }}
                 port:
                   number: {{ $svcPort }}
           {{- if $version.default }}
           - path: /doc
-            pathType: Prefix
+            pathType: ImplementationSpecific
             backend:
               service:
                 name: {{ $fullName }}-{{ $version.schema | replace "." "-" }}

install/charts/oasf/templates/ingress/ingress-export.yaml

@@ -22,7 +22,7 @@ metadata:
   labels:
     {{- include "chart.labels" . | nindent 4 }}
   annotations:
-  {{- if eq .Values.ingress.className "nginx" }}
+  {{- if or (eq .Values.ingress.className "nginx") (eq .Values.ingress.className "nginx-internal") }}
     nginx.ingress.kubernetes.io/rewrite-target: /export/$2
     nginx.ingress.kubernetes.io/use-regex: "true"
   {{- end }}