Sync apis/gloo v1.20 support glob rbac

.github/workflows/lts-branch-create-pull-request.yaml

@@ -6,14 +6,14 @@ on:
 
 jobs:
   create-pr-for-api-sync-branches:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Cancel Previous Actions
-        uses: styfle/cancel-workflow-action@0.4.1
+        uses: styfle/cancel-workflow-action@0.11.0
         with:
           access_token: ${{ github.token }}
       - name: Checkout Branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Parse GitHub Ref
         id: parse_github_ref
         env:
@@ -31,8 +31,8 @@ jobs:
           DESTINATION_BRANCH=$(echo $GITHUB_BRANCH_NAME | cut -f $DEST_BRANCH_FIELD_NUMBER -d $DELIMITER )
           TAG_NAME=$(echo $GITHUB_BRANCH_NAME | cut -f $TAG_NAME_FIELD_NUMBER -d $DELIMITER )
 
-          echo "::set-output name=destination_branch::$(echo $DESTINATION_BRANCH )"
-          echo "::set-output name=tag_name::$(echo $TAG_NAME )"
+          echo "destination_branch=$DESTINATION_BRANCH" >> $GITHUB_OUTPUT
+          echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
       - name: Setup Git
         env:
           GIT_USER_NAME: soloio-bot
@@ -53,19 +53,12 @@ jobs:
           else
             echo "$BRANCH exists, nothing to do"
           fi
-      - name: Push Commit with Tag Name
-        env:
-          COMMIT_MESSAGE: "@soloio-bot Sync APIs. @tag-name=${{ steps.parse_github_ref.outputs.tag_name }}"
-        run: |
-          git add .
-          git commit -m "$COMMIT_MESSAGE" --allow-empty
-          git push
       - name: Create Pull Request
-        uses: repo-sync/pull-request@v2
+        uses: repo-sync/pull-request@v2.6.2
         with:
           destination_branch: ${{ steps.parse_github_ref.outputs.destination_branch }}
           pr_reviewer: "solo-apis/solo-apis"
           pr_label: "auto-pr"
           pr_allow_empty: true
           github_token: ${{ secrets.SOLO_BOT_REPO_SECRET }}
-          pr_title: "Sync APIs to ${{ steps.parse_github_ref.outputs.tag_name }}"
+          pr_title: "Sync APIs. @tag-name=${{ steps.parse_github_ref.outputs.tag_name }}"

.github/workflows/lts-branch-tag-commit.yaml

@@ -2,33 +2,34 @@ name: Tag Commit on LTS Branch
 on:
   push:
     branches:
-      - master
-      - 'gloo-master'
+      - main
+      - 'gloo-main'
       - 'gloo-v**.**.x'
 jobs:
   tag-version:
     runs-on: ubuntu-latest
     env:
       # The regex of a commit produced by the soloio-bot
-      COMMIT_REGEX: "^.*(@soloio-bot Sync APIs.)+.*$"
+      COMMIT_REGEX: "^.*(Sync APIs.)+.*$"
     steps:
       - name: Cancel Previous Actions
-        uses: styfle/cancel-workflow-action@0.4.1
+        uses: styfle/cancel-workflow-action@0.11.0
         with:
           access_token: ${{ github.token }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: '0'
       - name: Parse out tag name from commit message
         id: tag_version
         run: |
           if [[ $(git log -1 --oneline) =~ ${{ env.COMMIT_REGEX }} ]]; then
-            TAG_NAME=$(git log -1 --oneline | cut -d "@tag-name=" -f 2)
+            TAG_NAME=$(git log -1 --oneline | awk -F'@tag-name=' '{print $2}' | awk -F' ' '{print $1}')
           fi
-          echo "::set-output name=tag_name::$(echo $TAG_NAME)"
+          echo "tag_name=$TAG_NAME" >> $GITHUB_OUTPUT
       - name: Bump version and push tag
         if: steps.tag_version.outputs.tag_name != ''
-        uses: anothrNick/github-tag-action@1.26.0
+        uses: anothrNick/github-tag-action@1.39.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          CUSTOM_TAG: ${{ steps.tag_version.outputs.tag_name }}
+          CUSTOM_TAG: ${{ steps.tag_version.outputs.tag_name }}
+          RELEASE_BRANCHES: '.*master$,gloo-v[0-9]+\.[0-9]+\.x$'

.github/workflows/pull_request.yaml

@@ -1,69 +1,54 @@
 name: pull_request
 
 on:
-  push:
-    branches:
-    - 'master'
   pull_request:
 
 jobs:
   gen:
     name: Code Gen
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
     - name: Cancel Previous Runs
-      uses: styfle/cancel-workflow-action@0.4.0
+      uses: styfle/cancel-workflow-action@0.11.0
       with:
         access_token: ${{ github.token }}
-    - name: Set up Go 1.14
-      uses: actions/setup-go@v1
+    - uses: actions/checkout@v3
       with:
-        go-version: 1.14
+        fetch-depth: 0
+    - name: Set up Go
+      uses: actions/setup-go@v4
+      with:
+        go-version-file: go.mod
       id: go
     - name: Install Protoc
-      uses: solo-io/setup-protoc@master
+      uses: arduino/setup-protoc@v1
       with:
         version: '3.6.1'
         repo-token: ${{ secrets.GITHUB_TOKEN }}
-    - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
-    - uses: actions/cache@v1
-      with:
-        path: ~/go/pkg/mod
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-        restore-keys: |
-          ${{ runner.os }}-go-
     - name: Generate Code
       run: |
         ./ci/check-code-gen.sh
 
   test:
     name: Tests
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Cancel Previous Runs
-        uses: styfle/cancel-workflow-action@0.4.0
+        uses: styfle/cancel-workflow-action@0.11.0
         with:
           access_token: ${{ github.token }}
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           fetch-depth: 0
       - name: Setup Private Repo Permissions
         env:
           TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
         run: |
           git config --global url."https://${TOKEN}@github.com/solo-io/".insteadOf "https://github.com/solo-io/"
-      - name: Set up Go 1.14
-        uses: actions/setup-go@v1
-        with:
-          go-version: 1.14
-      - uses: actions/cache@v1
+      - name: Set up Go
+        uses: actions/setup-go@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go
+          go-version-file: go.mod
       - name: Run tests
         run: |
-          go test ./test/scripts/...
+          go test ./test/...

Makefile

@@ -10,7 +10,7 @@ generate-code:
 	PATH=$(DEPSGOBIN):$$PATH ./hack/post-generate.sh
 
 .PHONY: generate-mocks
-generate-mocks:
+generate-mocks: tidy
 	PATH=$(DEPSGOBIN):$$PATH go generate ./...
 
 .PHONY: tidy

api/gloo-fed/fed.enterprise.gloo/v1/auth_config.proto

@@ -4,15 +4,17 @@ package fed.enterprise.gloo.solo.io;
 option go_package = "github.com/solo-io/solo-apis/pkg/api/fed.enterprise.gloo.solo.io/v1/types";
 
 
+option (extproto.equal_all) = true;
 import "extproto/ext.proto";
 option (extproto.hash_all) = true;
-option (extproto.equal_all) = true;
 
-import "github.com/solo-io/solo-apis/api/skv2-enterprise/v1alpha1/multicluster.proto";
+import "github.com/solo-io/solo-apis/api/gloo-fed/multicluster/v1alpha1/multicluster.proto";
 import "github.com/solo-io/solo-apis/api/gloo-fed/fed/core/v1/placement.proto";
 import "github.com/solo-io/solo-apis/api/gloo/enterprise.gloo/v1/auth_config.proto";
 
-
+// The Federated[Resource] CRDs are a gloo-fed wrapper around Gloo Edge CRDs, with a Placement field indicating which
+// clusters and namespaces to federate the object to.
+// For more, see: https://docs.solo.io/gloo-edge/latest/guides/gloo_federation/federated_configuration/
 message FederatedAuthConfigSpec {
     message Template {
         .enterprise.gloo.solo.io.AuthConfigSpec spec = 1;
@@ -27,4 +29,5 @@ message FederatedAuthConfigSpec {
 
 message FederatedAuthConfigStatus {
     core.fed.solo.io.PlacementStatus placement_status = 1;
+    map<string,core.fed.solo.io.PlacementStatus> namespaced_placement_statuses = 2;
 }

api/gloo-fed/fed.gateway/v1/gateway.proto

@@ -4,16 +4,19 @@ package fed.gateway.solo.io;
 option go_package = "github.com/solo-io/solo-apis/pkg/api/fed.gateway.solo.io/v1/types";
 
 
+option (extproto.equal_all) = true;
 import "extproto/ext.proto";
 option (extproto.hash_all) = true;
-option (extproto.equal_all) = true;
 
-import "github.com/solo-io/solo-apis/api/skv2-enterprise/v1alpha1/multicluster.proto";
+import "github.com/solo-io/solo-apis/api/gloo-fed/multicluster/v1alpha1/multicluster.proto";
 import "github.com/solo-io/solo-apis/api/gloo-fed/fed/core/v1/placement.proto";
 import "github.com/solo-io/solo-apis/api/gloo/gateway/v1/gateway.proto";
 
 import "google/protobuf/wrappers.proto";
 
+// The Federated[Resource] CRDs are a gloo-fed wrapper around Gloo Edge CRDs, with a Placement field indicating which
+// clusters and namespaces to federate the object to.
+// For more, see: https://docs.solo.io/gloo-edge/latest/guides/gloo_federation/federated_configuration/
 message FederatedGatewaySpec {
 
     message Template {
@@ -29,4 +32,5 @@ message FederatedGatewaySpec {
 
 message FederatedGatewayStatus {
     core.fed.solo.io.PlacementStatus placement_status = 1;
+    map<string,core.fed.solo.io.PlacementStatus> namespaced_placement_statuses = 2;
 }

api/gloo-fed/fed.gateway/v1/matchable_http_gateway.proto

@@ -0,0 +1,36 @@
+syntax = "proto3";
+package fed.gateway.solo.io;
+
+option go_package = "github.com/solo-io/solo-apis/pkg/api/fed.gateway.solo.io/v1/types";
+
+
+option (extproto.equal_all) = true;
+import "extproto/ext.proto";
+option (extproto.hash_all) = true;
+
+import "github.com/solo-io/solo-apis/api/gloo-fed/multicluster/v1alpha1/multicluster.proto";
+import "github.com/solo-io/solo-apis/api/gloo-fed/fed/core/v1/placement.proto";
+import "github.com/solo-io/solo-apis/api/gloo/gateway/v1/matchable_http_gateway.proto";
+
+import "google/protobuf/wrappers.proto";
+
+// The Federated[Resource] CRDs are a gloo-fed wrapper around Gloo Edge CRDs, with a Placement field indicating which
+// clusters and namespaces to federate the object to.
+// For more, see: https://docs.solo.io/gloo-edge/latest/guides/gloo_federation/federated_configuration/
+message FederatedMatchableHttpGatewaySpec {
+
+    message Template {
+        .gateway.solo.io.MatchableHttpGatewaySpec spec = 1;
+
+        core.fed.solo.io.TemplateMetadata metadata = 2;
+    }
+
+    Template template = 1;
+
+    multicluster.solo.io.Placement placement = 2;
+}
+
+message FederatedMatchableHttpGatewayStatus {
+    core.fed.solo.io.PlacementStatus placement_status = 1;
+    map<string,core.fed.solo.io.PlacementStatus> namespaced_placement_statuses = 2;
+}

api/gloo-fed/fed.gateway/v1/matchable_tcp_gateway.proto

@@ -0,0 +1,36 @@
+syntax = "proto3";
+package fed.gateway.solo.io;
+
+option go_package = "github.com/solo-io/solo-apis/pkg/api/fed.gateway.solo.io/v1/types";
+
+
+option (extproto.equal_all) = true;
+import "extproto/ext.proto";
+option (extproto.hash_all) = true;
+
+import "github.com/solo-io/solo-apis/api/gloo-fed/multicluster/v1alpha1/multicluster.proto";
+import "github.com/solo-io/solo-apis/api/gloo-fed/fed/core/v1/placement.proto";
+import "github.com/solo-io/solo-apis/api/gloo/gateway/v1/matchable_tcp_gateway.proto";
+
+import "google/protobuf/wrappers.proto";
+
+// The Federated[Resource] CRDs are a gloo-fed wrapper around Gloo Edge CRDs, with a Placement field indicating which
+// clusters and namespaces to federate the object to.
+// For more, see: https://docs.solo.io/gloo-edge/latest/guides/gloo_federation/federated_configuration/
+message FederatedMatchableTcpGatewaySpec {
+
+    message Template {
+        .gateway.solo.io.MatchableTcpGatewaySpec spec = 1;
+
+        core.fed.solo.io.TemplateMetadata metadata = 2;
+    }
+
+    Template template = 1;
+
+    multicluster.solo.io.Placement placement = 2;
+}
+
+message FederatedMatchableTcpGatewayStatus {
+    core.fed.solo.io.PlacementStatus placement_status = 1;
+    map<string,core.fed.solo.io.PlacementStatus> namespaced_placement_statuses = 2;
+}