Merge branch 'master' into smallinsky/fix_dynamodb_1mb_issue

gravitational · Mar 2, 2022 · 27e6472 · 27e6472
2 parents 673d3ca + cda00f3
commit 27e6472
Show file tree

Hide file tree

Showing 78 changed files with 3,758 additions and 1,753 deletions.
diff --git a/.cloudbuild/ci/integration-tests.yaml b/.cloudbuild/ci/integration-tests.yaml
@@ -11,7 +11,7 @@ steps:
 
   # Run the integration tests. Actual content of this job depends on the changes 
   # detected in the PR
-  - name: quay.io/gravitational/teleport-buildbox:go1.17.2
+  - name: quay.io/gravitational/teleport-buildbox:teleport10
     id: run-tests
     dir: /workspace/.cloudbuild/scripts
     entrypoint: bash

diff --git a/.cloudbuild/ci/lint.yaml b/.cloudbuild/ci/lint.yaml
@@ -1,5 +1,5 @@
 steps:
-  - name: quay.io/gravitational/teleport-buildbox:go1.17.2
+  - name: quay.io/gravitational/teleport-buildbox:teleport10
     id: lint
     args: ['make', 'lint']
 options:

diff --git a/.cloudbuild/ci/unit-tests.yaml b/.cloudbuild/ci/unit-tests.yaml
@@ -13,7 +13,7 @@ steps:
 
   # Run the unit tests. Actual content of this job depends on the changes 
   # detected in the PR
-  - name: quay.io/gravitational/teleport-buildbox:go1.17.2
+  - name: quay.io/gravitational/teleport-buildbox:teleport10
     id: run-tests
     dir: /workspace/.cloudbuild/scripts
     entrypoint: bash 

diff --git a/.drone.yml b/.drone.yml
@@ -9,8 +9,9 @@ kind: pipeline
 type: kubernetes
 name: push-build-linux-amd64
 environment:
+  BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.2
+  RUNTIME: go1.17.7
   UID: "1000"
 trigger:
   event:
@@ -111,8 +112,9 @@ kind: pipeline
 type: kubernetes
 name: push-build-linux-386
 environment:
+  BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.2
+  RUNTIME: go1.17.7
   UID: "1000"
 trigger:
   event:
@@ -213,8 +215,9 @@ kind: pipeline
 type: kubernetes
 name: push-build-linux-amd64-fips
 environment:
+  BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.2
+  RUNTIME: go1.17.7
   UID: "1000"
 trigger:
   event:
@@ -319,8 +322,9 @@ kind: pipeline
 type: kubernetes
 name: push-build-windows-amd64
 environment:
+  BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.2
+  RUNTIME: go1.17.7
   UID: "1000"
 trigger:
   event:
@@ -480,7 +484,7 @@ steps:
   - tar -C  ~/build-$DRONE_BUILD_NUMBER-$DRONE_BUILD_CREATED-toolchains -xzf $RUNTIME.darwin-amd64.tar.gz
   - rm -rf $RUNTIME.darwin-amd64.tar.gz
   environment:
-    RUNTIME: go1.17.2
+    RUNTIME: go1.17.7
 - name: Install Rust Toolchain
   commands:
   - set -u
@@ -563,8 +567,9 @@ kind: pipeline
 type: kubernetes
 name: push-build-linux-arm
 environment:
+  BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.2
+  RUNTIME: go1.17.7
   UID: "1000"
 trigger:
   event:
@@ -665,8 +670,9 @@ kind: pipeline
 type: kubernetes
 name: push-build-linux-arm64
 environment:
+  BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.2
+  RUNTIME: go1.17.7
   UID: "1000"
 trigger:
   event:
@@ -1025,7 +1031,8 @@ kind: pipeline
 type: kubernetes
 name: build-linux-amd64-centos7
 environment:
-  RUNTIME: go1.17.2
+  BUILDBOX_VERSION: teleport10
+  RUNTIME: go1.17.7
 trigger:
   event:
     include:
@@ -1166,7 +1173,8 @@ kind: pipeline
 type: kubernetes
 name: build-linux-amd64-centos7-fips
 environment:
-  RUNTIME: go1.17.2
+  BUILDBOX_VERSION: teleport10
+  RUNTIME: go1.17.7
 trigger:
   event:
     include:
@@ -1306,7 +1314,8 @@ kind: pipeline
 type: kubernetes
 name: build-linux-amd64
 environment:
-  RUNTIME: go1.17.2
+  BUILDBOX_VERSION: teleport10
+  RUNTIME: go1.17.7
 trigger:
   event:
     include:
@@ -1444,7 +1453,8 @@ kind: pipeline
 type: kubernetes
 name: build-linux-amd64-fips
 environment:
-  RUNTIME: go1.17.2
+  BUILDBOX_VERSION: teleport10
+  RUNTIME: go1.17.7
 trigger:
   event:
     include:
@@ -1575,7 +1585,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -1741,7 +1751,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -1904,7 +1914,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -2056,7 +2066,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -2212,7 +2222,8 @@ kind: pipeline
 type: kubernetes
 name: build-linux-386
 environment:
-  RUNTIME: go1.17.2
+  BUILDBOX_VERSION: teleport10
+  RUNTIME: go1.17.7
 trigger:
   event:
     include:
@@ -2343,7 +2354,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -2509,7 +2520,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -2727,7 +2738,7 @@ steps:
   - tar -C  ~/build-$DRONE_BUILD_NUMBER-$DRONE_BUILD_CREATED-toolchains -xzf $RUNTIME.darwin-amd64.tar.gz
   - rm -rf $RUNTIME.darwin-amd64.tar.gz
   environment:
-    RUNTIME: go1.17.2
+    RUNTIME: go1.17.7
 - name: Install Rust Toolchain
   commands:
   - set -u
@@ -3113,9 +3124,9 @@ steps:
     ARCH: amd64
     BUILDBOX_PASSWORD:
       from_secret: BUILDBOX_PASSWORD
-    ENT_TARBALL_PATH: /tmp/build-darwin-amd64-pkg-tsh/go/artifacts
+    ENT_TARBALL_PATH: /tmp/build-darwin-amd64-pkg/go/artifacts
     OS: darwin
-    OSS_TARBALL_PATH: /tmp/build-darwin-amd64-pkg-tsh/go/artifacts
+    OSS_TARBALL_PATH: /tmp/build-darwin-amd64-pkg/go/artifacts
     WORKSPACE_DIR: /tmp/build-darwin-amd64-pkg-tsh
 - name: Copy Mac pkg artifacts
   commands:
@@ -3194,7 +3205,8 @@ kind: pipeline
 type: kubernetes
 name: build-linux-arm
 environment:
-  RUNTIME: go1.17.2
+  BUILDBOX_VERSION: teleport10
+  RUNTIME: go1.17.7
 trigger:
   event:
     include:
@@ -3332,7 +3344,8 @@ kind: pipeline
 type: kubernetes
 name: build-linux-arm64
 environment:
-  RUNTIME: go1.17.2
+  BUILDBOX_VERSION: teleport10
+  RUNTIME: go1.17.7
 trigger:
   event:
     include:
@@ -3463,7 +3476,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -3615,7 +3628,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -3767,7 +3780,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -3933,7 +3946,7 @@ volumes:
 ################################################
 # Generated using dronegen, do not edit by hand!
 # Use 'make dronegen' to update.
-# Generated at dronegen/tag.go:409
+# Generated at dronegen/tag.go:410
 ################################################
 
 kind: pipeline
@@ -4106,7 +4119,8 @@ kind: pipeline
 type: kubernetes
 name: build-windows-amd64
 environment:
-  RUNTIME: go1.17.2
+  BUILDBOX_VERSION: teleport10
+  RUNTIME: go1.17.7
 trigger:
   event:
     include:
@@ -4242,7 +4256,8 @@ type: kubernetes
 name: build-docker-images
 
 environment:
-  RUNTIME: go1.17.2
+  BUILDBOX_VERSION: "teleport10"
+  RUNTIME: go1.17.7
 
 trigger:
   event:
@@ -4305,7 +4320,7 @@ steps:
       - apk add --no-cache make
       - chown -R $UID:$GID /go
       - docker login -u="$PLUGIN_USERNAME" -p="$PLUGIN_PASSWORD" quay.io
-      - docker pull quay.io/gravitational/teleport-buildbox:$RUNTIME || true
+      - docker pull quay.io/gravitational/teleport-buildbox:$BUILDBOX_VERSION || true
       - cd /go/src/github.com/gravitational/teleport
       - make image-ci publish-ci
 
@@ -4330,7 +4345,7 @@ steps:
       - apk add --no-cache make
       - chown -R $UID:$GID /go
       - docker login -u="$PLUGIN_USERNAME" -p="$PLUGIN_PASSWORD" quay.io
-      - docker pull quay.io/gravitational/teleport-buildbox:$RUNTIME || true
+      - docker pull quay.io/gravitational/teleport-buildbox:BUILDBOX_VERSION || true
       - cd /go/src/github.com/gravitational/teleport
       # VERSION needs to be set manually when running in the e directory.
       # Normally, the version is set and exported by the root Makefile and then inherited,
@@ -4566,8 +4581,8 @@ kind: pipeline
 type: kubernetes
 name: build-buildboxes
 environment:
+  BUILDBOX_VERSION: teleport10
   GID: "1000"
-  RUNTIME: go1.17.2
   UID: "1000"
 trigger:
   event:
@@ -4579,6 +4594,7 @@ trigger:
   branch:
     include:
     - master
+    - branch/*
 workspace:
   path: /go/src/github.com/gravitational/teleport
 clone:
@@ -4604,7 +4620,7 @@ steps:
   - chown -R $UID:$GID /go
   - docker login -u="$$QUAYIO_DOCKER_USERNAME" -p="$$QUAYIO_DOCKER_PASSWORD" quay.io
   - make -C build.assets buildbox
-  - docker push quay.io/gravitational/teleport-buildbox:$RUNTIME
+  - docker push quay.io/gravitational/teleport-buildbox:$BUILDBOX_VERSION
   environment:
     QUAYIO_DOCKER_PASSWORD:
       from_secret: QUAYIO_DOCKER_PASSWORD
@@ -4620,7 +4636,7 @@ steps:
   - chown -R $UID:$GID /go
   - docker login -u="$$QUAYIO_DOCKER_USERNAME" -p="$$QUAYIO_DOCKER_PASSWORD" quay.io
   - make -C build.assets buildbox-fips
-  - docker push quay.io/gravitational/teleport-buildbox-fips:$RUNTIME
+  - docker push quay.io/gravitational/teleport-buildbox-fips:$BUILDBOX_VERSION
   environment:
     QUAYIO_DOCKER_PASSWORD:
       from_secret: QUAYIO_DOCKER_PASSWORD
@@ -4636,7 +4652,7 @@ steps:
   - chown -R $UID:$GID /go
   - docker login -u="$$QUAYIO_DOCKER_USERNAME" -p="$$QUAYIO_DOCKER_PASSWORD" quay.io
   - make -C build.assets buildbox-arm
-  - docker push quay.io/gravitational/teleport-buildbox-arm:$RUNTIME
+  - docker push quay.io/gravitational/teleport-buildbox-arm:$BUILDBOX_VERSION
   environment:
     QUAYIO_DOCKER_PASSWORD:
       from_secret: QUAYIO_DOCKER_PASSWORD
@@ -5040,6 +5056,6 @@ volumes:
       name: drone-s3-debrepo-pvc
 ---
 kind: signature
-hmac: 2fa9a32bf1f8b0fe5ef6abb7b0cdd30df5cd8813ca2bdbc3fdbd9b1d7296f459
+hmac: 91c43e2655c4225898f8ba6fc034a0b5ee3de067d2f58979a474fcba342db799
 
 ...