Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update master for v18 #47988

Merged
merged 1 commit into from
Dec 31, 2024
+228 −228
Merged

Update master for v18 #47988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# Stable releases: "1.0.0"
# Pre-releases: "1.0.0-alpha.1", "1.0.0-beta.2", "1.0.0-rc.3"
# Master/dev branch: "1.0.0-dev"
VERSION=17.0.0-dev
VERSION=18.0.0-dev

DOCKER_IMAGE ?= teleport

Expand Down
2 changes: 1 addition & 1 deletion api/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion build.assets/images.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ DIR := $(dir $(lastword $(MAKEFILE_LIST)))
include $(DIR)arch.mk
endif

BUILDBOX_VERSION ?= teleport17
BUILDBOX_VERSION ?= teleport18
BUILDBOX_BASE_NAME ?= ghcr.io/gravitational/teleport-buildbox

BUILDBOX = $(BUILDBOX_BASE_NAME):$(BUILDBOX_VERSION)
Expand Down
2 changes: 1 addition & 1 deletion examples/chart/access/datadog/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.version: &version "17.0.0-dev"
.version: &version "18.0.0-dev"

apiVersion: v2
name: teleport-plugin-datadog
Expand Down
4 changes: 2 additions & 2 deletions examples/chart/access/datadog/tests/__snapshot__/configmap_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-datadog
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-datadog-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-datadog-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-datadog
8 changes: 4 additions & 4 deletions examples/chart/access/datadog/tests/__snapshot__/deployment_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-datadog
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-datadog-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-datadog-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-datadog
spec:
replicas: 1
Expand All @@ -22,8 +22,8 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-datadog
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-datadog-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-datadog-18.0.0-dev
spec:
containers:
- command:
Expand Down
2 changes: 1 addition & 1 deletion examples/chart/access/discord/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.version: &version "17.0.0-dev"
.version: &version "18.0.0-dev"

apiVersion: v2
name: teleport-plugin-discord
Expand Down
4 changes: 2 additions & 2 deletions examples/chart/access/discord/tests/__snapshot__/configmap_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-discord
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-discord-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-discord-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-discord
8 changes: 4 additions & 4 deletions examples/chart/access/discord/tests/__snapshot__/deployment_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-discord
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-discord-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-discord-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-discord
spec:
replicas: 1
Expand All @@ -22,8 +22,8 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-discord
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-discord-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-discord-18.0.0-dev
spec:
containers:
- command:
Expand Down
2 changes: 1 addition & 1 deletion examples/chart/access/email/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.version: &version "17.0.0-dev"
.version: &version "18.0.0-dev"

apiVersion: v2
name: teleport-plugin-email
Expand Down
24 changes: 12 additions & 12 deletions examples/chart/access/email/tests/__snapshot__/configmap_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ should match the snapshot (mailgun on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
should match the snapshot (smtp on):
1: |
Expand Down Expand Up @@ -59,8 +59,8 @@ should match the snapshot (smtp on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
should match the snapshot (smtp on, no starttls):
1: |
Expand Down Expand Up @@ -92,8 +92,8 @@ should match the snapshot (smtp on, no starttls):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
should match the snapshot (smtp on, password file):
1: |
Expand Down Expand Up @@ -125,8 +125,8 @@ should match the snapshot (smtp on, password file):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
should match the snapshot (smtp on, roleToRecipients set):
1: |
Expand Down Expand Up @@ -161,8 +161,8 @@ should match the snapshot (smtp on, roleToRecipients set):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
should match the snapshot (smtp on, starttls disabled):
1: |
Expand Down Expand Up @@ -194,6 +194,6 @@ should match the snapshot (smtp on, starttls disabled):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
58 changes: 29 additions & 29 deletions examples/chart/access/email/tests/__snapshot__/deployment_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ should be possible to override volume name (smtp on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
spec:
replicas: 1
Expand All @@ -22,8 +22,8 @@ should be possible to override volume name (smtp on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
spec:
containers:
- command:
Expand All @@ -34,7 +34,7 @@ should be possible to override volume name (smtp on):
env:
- name: TELEPORT_PLUGIN_FAIL_FAST
value: "true"
image: public.ecr.aws/gravitational/teleport-plugin-email:17.0.0-dev
image: public.ecr.aws/gravitational/teleport-plugin-email:18.0.0-dev
imagePullPolicy: IfNotPresent
name: teleport-plugin-email
ports:
Expand Down Expand Up @@ -75,8 +75,8 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
spec:
replicas: 1
Expand All @@ -90,8 +90,8 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
spec:
containers:
- command:
Expand Down Expand Up @@ -136,8 +136,8 @@ should match the snapshot (mailgun on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
spec:
replicas: 1
Expand All @@ -151,8 +151,8 @@ should match the snapshot (mailgun on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
spec:
containers:
- command:
Expand All @@ -163,7 +163,7 @@ should match the snapshot (mailgun on):
env:
- name: TELEPORT_PLUGIN_FAIL_FAST
value: "true"
image: public.ecr.aws/gravitational/teleport-plugin-email:17.0.0-dev
image: public.ecr.aws/gravitational/teleport-plugin-email:18.0.0-dev
imagePullPolicy: IfNotPresent
name: teleport-plugin-email
ports:
Expand Down Expand Up @@ -204,8 +204,8 @@ should match the snapshot (smtp on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
spec:
replicas: 1
Expand All @@ -219,8 +219,8 @@ should match the snapshot (smtp on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
spec:
containers:
- command:
Expand All @@ -231,7 +231,7 @@ should match the snapshot (smtp on):
env:
- name: TELEPORT_PLUGIN_FAIL_FAST
value: "true"
image: public.ecr.aws/gravitational/teleport-plugin-email:17.0.0-dev
image: public.ecr.aws/gravitational/teleport-plugin-email:18.0.0-dev
imagePullPolicy: IfNotPresent
name: teleport-plugin-email
ports:
Expand Down Expand Up @@ -272,8 +272,8 @@ should mount external secret (mailgun on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
spec:
replicas: 1
Expand All @@ -287,8 +287,8 @@ should mount external secret (mailgun on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
spec:
containers:
- command:
Expand All @@ -299,7 +299,7 @@ should mount external secret (mailgun on):
env:
- name: TELEPORT_PLUGIN_FAIL_FAST
value: "true"
image: public.ecr.aws/gravitational/teleport-plugin-email:17.0.0-dev
image: public.ecr.aws/gravitational/teleport-plugin-email:18.0.0-dev
imagePullPolicy: IfNotPresent
name: teleport-plugin-email
ports:
Expand Down Expand Up @@ -340,8 +340,8 @@ should mount external secret (smtp on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-email
spec:
replicas: 1
Expand All @@ -355,8 +355,8 @@ should mount external secret (smtp on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-email
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-email-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-email-18.0.0-dev
spec:
containers:
- command:
Expand All @@ -367,7 +367,7 @@ should mount external secret (smtp on):
env:
- name: TELEPORT_PLUGIN_FAIL_FAST
value: "true"
image: public.ecr.aws/gravitational/teleport-plugin-email:17.0.0-dev
image: public.ecr.aws/gravitational/teleport-plugin-email:18.0.0-dev
imagePullPolicy: IfNotPresent
name: teleport-plugin-email
ports:
Expand Down
2 changes: 1 addition & 1 deletion examples/chart/access/jira/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.version: &version "17.0.0-dev"
.version: &version "18.0.0-dev"

apiVersion: v2
name: teleport-plugin-jira
Expand Down
4 changes: 2 additions & 2 deletions examples/chart/access/jira/tests/__snapshot__/configmap_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ should match the snapshot (smtp on):
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-jira
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-jira-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-jira-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-jira
8 changes: 4 additions & 4 deletions examples/chart/access/jira/tests/__snapshot__/deployment_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-jira
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-jira-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-jira-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-jira
spec:
replicas: 1
Expand All @@ -22,8 +22,8 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-jira
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-jira-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-jira-18.0.0-dev
spec:
containers:
- command:
Expand Down
2 changes: 1 addition & 1 deletion examples/chart/access/mattermost/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.version: &version "17.0.0-dev"
.version: &version "18.0.0-dev"

apiVersion: v2
name: teleport-plugin-mattermost
Expand Down
4 changes: 2 additions & 2 deletions examples/chart/access/mattermost/tests/__snapshot__/configmap_test.yaml.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ should match the snapshot:
app.kubernetes.io/instance: RELEASE-NAME
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/name: teleport-plugin-mattermost
app.kubernetes.io/version: 17.0.0-dev
helm.sh/chart: teleport-plugin-mattermost-17.0.0-dev
app.kubernetes.io/version: 18.0.0-dev
helm.sh/chart: teleport-plugin-mattermost-18.0.0-dev
name: RELEASE-NAME-teleport-plugin-mattermost
Loading
Loading