Merge branch 'main' into add-namespace

weaveworks · Nov 14, 2024 · f934494 · f934494
2 parents 21f7575 + 64b5e44
commit f934494
Show file tree

Hide file tree

Showing 17 changed files with 996 additions and 1,795 deletions.
diff --git a/.github/workflows/ossf.yaml → .github/workflows/ossf.disabled_yaml b/.github/workflows/ossf.yaml → .github/workflows/ossf.disabled_yaml
@@ -2,7 +2,7 @@ name: ossf
 on:
   branch_protection_rule:
   push:
-    branches: [ main ]
+    branches: [ main-disabled ]
   schedule:
     # Weekly on Saturdays.
     - cron:  '30 1 * * 6'
@@ -46,4 +46,4 @@ jobs:
       - name: "Upload SARIF results to code scanning"
         uses: github/codeql-action/upload-sarif@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
         with:
-          sarif_file: results.sarif
+          sarif_file: results.sarif
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -143,7 +143,7 @@ jobs:
           path: /tmp/${{ matrix.docker-image }}.tar
 
   ci-upload-images:
-    name: CI Upload Images
+    name: CI Upload Images - Disabled
     runs-on: ubuntu-latest
     # Make sure we only upload images if tests etc have passed
     needs: [ci-go, ci-static, ci-js, ci-build-gitops-image, ci-generate-tag]
@@ -164,21 +164,21 @@ jobs:
         with:
           name: ${{ matrix.docker-image }}
           path: /tmp
-      - name: Authenticate to Google Cloud
-        id: gcloud-auth
-        uses: google-github-actions/auth@35b0e87d162680511bf346c299f71c9c5c379033 # v1.1.1
-        with:
-          service_account: ${{ secrets.service_account }}
-          workload_identity_provider: ${{ secrets.workload_identity_provider }}
-      - name: Login to gcloud for docker
-        run: gcloud --quiet auth configure-docker ${{ env.CI_CONTAINER_REGISTRY }}
-      - name: Push images to gcloud
-        run: |
-          docker load --input /tmp/${{ matrix.docker-image }}.tar
-          docker push "${{ env.CI_CONTAINER_REPOSITORY }}/${{ matrix.docker-image }}:${{ needs.ci-generate-tag.outputs.tag }}"
+#      - name: Authenticate to Google Cloud
+#        id: gcloud-auth
+#        uses: google-github-actions/auth@35b0e87d162680511bf346c299f71c9c5c379033 # v1.1.1
+#        with:
+#          service_account: ${{ secrets.service_account }}
+#          workload_identity_provider: ${{ secrets.workload_identity_provider }}
+#      - name: Login to gcloud for docker
+#        run: gcloud --quiet auth configure-docker ${{ env.CI_CONTAINER_REGISTRY }}
+#      - name: Push images to gcloud
+#        run: |
+#          docker load --input /tmp/${{ matrix.docker-image }}.tar
+#          docker push "${{ env.CI_CONTAINER_REPOSITORY }}/${{ matrix.docker-image }}:${{ needs.ci-generate-tag.outputs.tag }}"
 
   ci-upload-binary:
-    name: Upload Binary
+    name: Upload Binary - Disabled
     runs-on: ${{matrix.os}}
     needs: [ci-go, ci-static, ci-js, ci-build-gitops-image]
     strategy:
@@ -201,15 +201,15 @@ jobs:
     - name: build
       run: |
         make gitops
-    - name: publish to s3
-      uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 # v4.0.0
-      with:
-        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-        aws-region: us-east-2
-    - run: |
-        aws s3 cp bin/gitops s3://weave-gitops/gitops-${{matrix.os}}-${{steps.gitsha.outputs.sha}}
-        aws s3 cp s3://weave-gitops/gitops-${{matrix.os}}-${{steps.gitsha.outputs.sha}} s3://weave-gitops/gitops-${{matrix.os}}
+#    - name: publish to s3
+#      uses: aws-actions/configure-aws-credentials@8c3f20df09ac63af7b3ae3d7c91f105f857d8497 # v4.0.0
+#      with:
+#        aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+#        aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+#        aws-region: us-east-2
+#    - run: |
+#        aws s3 cp bin/gitops s3://weave-gitops/gitops-${{matrix.os}}-${{steps.gitsha.outputs.sha}}
+#        aws s3 cp s3://weave-gitops/gitops-${{matrix.os}}-${{steps.gitsha.outputs.sha}} s3://weave-gitops/gitops-${{matrix.os}}
 
   ci-publish-js-lib:
     name: Publish js library
@@ -257,7 +257,7 @@ jobs:
       - ci-go
       - ci-static
       - ci-js
-      - ci-build-gitops-image
+#      - ci-build-gitops-image
     if: github.event_name != 'push'
     steps:
       - run: echo "All done"
@@ -267,8 +267,8 @@ jobs:
     name: PR CI Pipeline
     runs-on: ubuntu-latest
     needs:
-      - ci-upload-images
-      - ci-upload-binary
+#      - ci-upload-images
+#      - ci-upload-binary
       - ci-publish-js-lib
     steps:
       - run: echo "All done"

diff --git a/api/core/core.swagger.json b/api/core/core.swagger.json
@@ -829,6 +829,7 @@
         "details": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/protobufAny"
           }
         }
@@ -900,6 +901,7 @@
         "conditions": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Condition"
           }
         },
@@ -978,6 +980,7 @@
         "objects": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Object"
           }
         }
@@ -1011,6 +1014,7 @@
         "entries": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1InventoryEntry"
           }
         }
@@ -1058,6 +1062,7 @@
         "kinds": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1GroupVersionKind"
           }
         },
@@ -1072,6 +1077,7 @@
         "objects": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Object"
           }
         }
@@ -1103,6 +1109,7 @@
         "logs": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1LogEntry"
           }
         },
@@ -1184,6 +1191,7 @@
         "children": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1InventoryEntry"
           }
         }
@@ -1220,6 +1228,7 @@
         "events": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Event"
           }
         }
@@ -1231,12 +1240,14 @@
         "crds": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Crd"
           }
         },
         "errors": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ListError"
           }
         }
@@ -1248,12 +1259,14 @@
         "deployments": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Deployment"
           }
         },
         "errors": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ListError"
           }
         }
@@ -1265,6 +1278,7 @@
         "namespaces": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Namespace"
           }
         }
@@ -1296,18 +1310,21 @@
         "objects": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Object"
           }
         },
         "errors": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ListError"
           }
         },
         "searchedNamespaces": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ClusterNamespaceList"
           }
         }
@@ -1319,6 +1336,7 @@
         "policies": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1PolicyObj"
           }
         },
@@ -1332,6 +1350,7 @@
         "errors": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ListError"
           }
         }
@@ -1369,6 +1388,7 @@
         "violations": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1PolicyValidation"
           }
         },
@@ -1382,6 +1402,7 @@
         "errors": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ListError"
           }
         }
@@ -1393,12 +1414,14 @@
         "crds": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Crd"
           }
         },
         "errors": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ListError"
           }
         }
@@ -1410,12 +1433,14 @@
         "deployments": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1Deployment"
           }
         },
         "errors": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ListError"
           }
         }
@@ -1485,6 +1510,7 @@
         "inventory": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1GroupVersionKind"
           }
         },
@@ -1558,6 +1584,7 @@
         "standards": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1PolicyStandard"
           }
         },
@@ -1567,6 +1594,7 @@
         "parameters": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1PolicyParam"
           }
         },
@@ -1645,6 +1673,7 @@
         "labels": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1PolicyTargetLabel"
           }
         },
@@ -1704,6 +1733,7 @@
         "occurrences": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1PolicyValidationOccurrence"
           }
         },
@@ -1713,6 +1743,7 @@
         "parameters": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1PolicyValidationParam"
           }
         }
@@ -1752,6 +1783,7 @@
         "objects": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ObjectRef"
           }
         },
@@ -1769,6 +1801,7 @@
         "objects": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/v1ObjectRef"
           }
         },

diff --git a/api/core/types.swagger.json b/api/core/types.swagger.json
@@ -36,6 +36,7 @@
         "details": {
           "type": "array",
           "items": {
+            "type": "object",
             "$ref": "#/definitions/protobufAny"
           }
         }

diff --git a/buf.lock b/buf.lock
@@ -4,7 +4,7 @@ deps:
   - remote: buf.build
     owner: googleapis
     repository: googleapis
-    commit: f52d4f76a8434cc5966798b1d3b4f110
+    commit: 553fd4b4b3a640be9b69a3fa0c17b383
   - remote: buf.build
     owner: grpc-ecosystem
     repository: grpc-gateway