Skip to content

Commit 260ce2b

Browse files
espadoliniespadolini
committed
Merge remote-tracking branch 'origin/master' into espadolini/stable-unix-user-api
2 parents 02cac25 + 0550380 commit 260ce2b

File tree

435 files changed

+18146
-13272
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

435 files changed

+18146
-13272
lines changed

‎.github/dependabot.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ updates:
2121
- dependency-name: github.com/microsoft/go-mssqldb
2222
- dependency-name: github.com/redis/go-redis/v9
2323
- dependency-name: github.com/vulcand/predicate
24-
# Ignore until kube libs are upgraded. See https://github.com/kubernetes-sigs/controller-runtime/issues/2788.
25-
- dependency-name: k8s.io/*
2624
open-pull-requests-limit: 20
2725
groups:
2826
go:

‎.github/workflows/build-centos7-assets.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
uses: actions/checkout@v4
2424

2525
- name: Set up Docker Buildx
26-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
26+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
2727
with:
2828
driver: docker
2929

‎.github/workflows/build-ci-buildbox-images.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/checkout@v4
3333

3434
- name: Set up Docker Buildx
35-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
35+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
3636
with:
3737
driver: docker
3838

@@ -60,7 +60,7 @@ jobs:
6060
uses: actions/checkout@v4
6161

6262
- name: Set up Docker Buildx
63-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
63+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
6464
with:
6565
driver: docker
6666

@@ -89,7 +89,7 @@ jobs:
8989
uses: actions/checkout@v4
9090

9191
- name: Set up Docker Buildx
92-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
92+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
9393
with:
9494
driver: docker
9595

@@ -118,7 +118,7 @@ jobs:
118118
uses: actions/checkout@v4
119119

120120
- name: Set up Docker Buildx
121-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
121+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
122122
with:
123123
driver: docker
124124

@@ -146,7 +146,7 @@ jobs:
146146
uses: actions/checkout@v4
147147

148148
- name: Set up Docker Buildx
149-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
149+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
150150
with:
151151
driver: docker
152152

‎.github/workflows/build-ci-service-images.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
uses: actions/checkout@v4
2828

2929
- name: Set up Docker Buildx
30-
uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
30+
uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
3131

3232
- name: Login to registry
3333
uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
@@ -44,7 +44,7 @@ jobs:
4444

4545
- name: Build etcd image
4646
id: docker_build
47-
uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
47+
uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
4848
with:
4949
context: ${{ github.workspace }}
5050
file: .github/services/Dockerfile.etcd

‎.github/workflows/build-usage-image.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
run: |
1616
echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
1717
- uses: actions/checkout@v4
18-
- uses: docker/setup-buildx-action@c47758b77c9736f4b2ef4073d4d51994fabfe349 # v3.7.1
18+
- uses: docker/setup-buildx-action@6524bf65af31da8d45b59e8c27de4bd072b392f5 # v3.8.0
1919
- uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
2020
with:
2121
role-to-assume: ${{ secrets.TELEPORT_USAGE_IAM_ROLE_ARN }}
@@ -24,7 +24,7 @@ jobs:
2424
with:
2525
registry-type: public
2626
# Build and publish container image on ECR.
27-
- uses: docker/build-push-action@48aba3b46d1b1fec4febb7c5d0c644b249a11355 # v6.10.0
27+
- uses: docker/build-push-action@67a2d409c0a876cbe6b11854e3e25193efe4e62d # v6.12.0
2828
with:
2929
context: "examples/teleport-usage"
3030
tags: public.ecr.aws/gravitational/teleport-usage:${{ steps.version.outputs.version }}

‎.github/workflows/lint.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,41 +108,41 @@ jobs:
108108
# Run various golangci-lint checks.
109109
# TODO(codingllama): Using go.work could save a bunch of repetition here.
110110
- name: golangci-lint (api)
111-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
111+
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
112112
with:
113113
version: ${{ env.GOLANGCI_LINT_VERSION }}
114114
working-directory: api
115115
args: --out-format=colored-line-number
116116
skip-cache: true
117117
- name: golangci-lint (teleport)
118-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
118+
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
119119
with:
120120
version: ${{ env.GOLANGCI_LINT_VERSION }}
121121
args: --out-format=colored-line-number --build-tags libfido2,piv
122122
skip-cache: true
123123
- name: golangci-lint (assets/backport)
124-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
124+
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
125125
with:
126126
version: ${{ env.GOLANGCI_LINT_VERSION }}
127127
working-directory: assets/backport
128128
args: --out-format=colored-line-number
129129
skip-cache: true
130130
- name: golangci-lint (build.assets/tooling)
131-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
131+
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
132132
with:
133133
version: ${{ env.GOLANGCI_LINT_VERSION }}
134134
working-directory: build.assets/tooling
135135
args: --out-format=colored-line-number
136136
skip-cache: true
137137
- name: golangci-lint (integrations/terraform)
138-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
138+
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
139139
with:
140140
version: ${{ env.GOLANGCI_LINT_VERSION }}
141141
working-directory: integrations/terraform
142142
args: --out-format=colored-line-number
143143
skip-cache: true
144144
- name: golangci-lint (integrations/event-handler)
145-
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
145+
uses: golangci/golangci-lint-action@ec5d18412c0aeab7936cb16880d708ba2a64e1ae # v6.2.0
146146
with:
147147
version: ${{ env.GOLANGCI_LINT_VERSION }}
148148
working-directory: integrations/event-handler
@@ -208,7 +208,7 @@ jobs:
208208
- name: Print linter versions
209209
run: |
210210
echo "BUF_VERSION=$BUF_VERSION"
211-
- uses: bufbuild/buf-setup-action@9672cee01808979ea1249f81d6d321217b9a10f6 # v1.47.2
211+
- uses: bufbuild/buf-setup-action@a47c93e0b1648d5651a065437926377d060baa99 # v1.50.0
212212
with:
213213
github_token: ${{ github.token }}
214214
version: ${{ env.BUF_VERSION }}

‎CHANGELOG.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,7 @@ sessions remains deny-by-default but now only `join_sessions` statements are
19601960
checked for session join RBAC.
19611961

19621962
See the [Moderated Sessions
1963-
guide](docs/pages/admin-guides/access-controls/guides/moderated-sessions.mdx) for more
1963+
guide](docs/pages/admin-guides/access-controls/guides/joining-sessions.mdx) for more
19641964
details.
19651965

19661966
#### GitHub connectors
@@ -2419,7 +2419,7 @@ With Moderated Sessions, Teleport administrators can define policies that allow
24192419
users to invite other users to participate in SSH or Kubernetes sessions as
24202420
observers, moderators or peers.
24212421

2422-
[Moderated Sessions guide](docs/pages/admin-guides/access-controls/guides/moderated-sessions.mdx)
2422+
[Moderated Sessions guide](docs/pages/admin-guides/access-controls/guides/joining-sessions.mdx)
24232423

24242424
### Breaking Changes
24252425

0 commit comments

Comments
 (0)