From 30d1d13d59f07e1ab9cb6ff7033eaae6427205bd Mon Sep 17 00:00:00 2001 From: Russell Jones Date: Sat, 16 Mar 2024 17:05:59 -0700 Subject: [PATCH] Release 14.3.10 (#39465) * Don't emit logs on Cloud. Updated `events.LoggingEmitter` to detect if running on Cloud both cluster features and modules. * Release 14.3.10 --------- Co-authored-by: Roman Tkachenko --- CHANGELOG.md | 2 +- Makefile | 2 +- api/version.go | 2 +- .../macos/tsh/tsh.app/Contents/Info.plist | 4 +- .../macos/tshdev/tsh.app/Contents/Info.plist | 4 +- examples/chart/teleport-cluster/Chart.yaml | 2 +- .../charts/teleport-operator/Chart.yaml | 2 +- .../auth_deployment_test.yaml.snap | 10 +-- .../proxy_deployment_test.yaml.snap | 18 +++--- examples/chart/teleport-kube-agent/Chart.yaml | 2 +- .../__snapshot__/deployment_test.yaml.snap | 58 ++++++++--------- .../tests/__snapshot__/job_test.yaml.snap | 10 +-- .../__snapshot__/statefulset_test.yaml.snap | 64 +++++++++---------- .../updater_deployment_test.yaml.snap | 4 +- lib/events/emitter.go | 4 +- lib/service/service.go | 4 +- 16 files changed, 96 insertions(+), 96 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4736ac3956074..c9b9370b745d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## 14.3.9 (03/16/24) +## 14.3.10 (03/16/24) * Fixed issue with Teleport auth server panicking when Access Graph is enabled in discovery service. [#39456](https://github.com/gravitational/teleport/pull/39456) diff --git a/Makefile b/Makefile index 03723c1b6a105..fc798abcb161b 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,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=14.3.9 +VERSION=14.3.10 DOCKER_IMAGE ?= teleport diff --git a/api/version.go b/api/version.go index 353ce38e6c5f5..1bc01ea239559 100644 --- a/api/version.go +++ b/api/version.go @@ -3,6 +3,6 @@ package api import "github.com/coreos/go-semver/semver" -const Version = "14.3.9" +const Version = "14.3.10" var SemVersion = semver.New(Version) diff --git a/build.assets/macos/tsh/tsh.app/Contents/Info.plist b/build.assets/macos/tsh/tsh.app/Contents/Info.plist index e8c1c94cf0108..c450c8691a9e8 100644 --- a/build.assets/macos/tsh/tsh.app/Contents/Info.plist +++ b/build.assets/macos/tsh/tsh.app/Contents/Info.plist @@ -19,13 +19,13 @@ CFBundlePackageType APPL CFBundleShortVersionString - 14.3.9 + 14.3.10 CFBundleSupportedPlatforms MacOSX CFBundleVersion - 14.3.9 + 14.3.10 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild diff --git a/build.assets/macos/tshdev/tsh.app/Contents/Info.plist b/build.assets/macos/tshdev/tsh.app/Contents/Info.plist index a7f37b4b8a381..c960882a7bf7b 100644 --- a/build.assets/macos/tshdev/tsh.app/Contents/Info.plist +++ b/build.assets/macos/tshdev/tsh.app/Contents/Info.plist @@ -17,13 +17,13 @@ CFBundlePackageType APPL CFBundleShortVersionString - 14.3.9 + 14.3.10 CFBundleSupportedPlatforms MacOSX CFBundleVersion - 14.3.9 + 14.3.10 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild diff --git a/examples/chart/teleport-cluster/Chart.yaml b/examples/chart/teleport-cluster/Chart.yaml index 678884ac6e5f1..bfc52eca0a998 100644 --- a/examples/chart/teleport-cluster/Chart.yaml +++ b/examples/chart/teleport-cluster/Chart.yaml @@ -1,4 +1,4 @@ -.version: &version "14.3.9" +.version: &version "14.3.10" name: teleport-cluster apiVersion: v2 diff --git a/examples/chart/teleport-cluster/charts/teleport-operator/Chart.yaml b/examples/chart/teleport-cluster/charts/teleport-operator/Chart.yaml index 012a8edaf089f..c61b5bdf72fca 100644 --- a/examples/chart/teleport-cluster/charts/teleport-operator/Chart.yaml +++ b/examples/chart/teleport-cluster/charts/teleport-operator/Chart.yaml @@ -1,4 +1,4 @@ -.version: &version "14.3.9" +.version: &version "14.3.10" name: teleport-operator apiVersion: v2 diff --git a/examples/chart/teleport-cluster/tests/__snapshot__/auth_deployment_test.yaml.snap b/examples/chart/teleport-cluster/tests/__snapshot__/auth_deployment_test.yaml.snap index decbf19a18f73..2593fc213bbdf 100644 --- a/examples/chart/teleport-cluster/tests/__snapshot__/auth_deployment_test.yaml.snap +++ b/examples/chart/teleport-cluster/tests/__snapshot__/auth_deployment_test.yaml.snap @@ -1,6 +1,6 @@ should add an operator side-car when operator is enabled: 1: | - image: public.ecr.aws/gravitational/teleport-operator:14.3.9 + image: public.ecr.aws/gravitational/teleport-operator:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: httpGet: @@ -41,7 +41,7 @@ should add an operator side-car when operator is enabled: - args: - --diag-addr=0.0.0.0:3000 - --apply-on-startup=/etc/teleport/apply-on-startup.yaml - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -174,7 +174,7 @@ should set nodeSelector when set in values: - args: - --diag-addr=0.0.0.0:3000 - --apply-on-startup=/etc/teleport/apply-on-startup.yaml - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -271,7 +271,7 @@ should set resources when set in values: - args: - --diag-addr=0.0.0.0:3000 - --apply-on-startup=/etc/teleport/apply-on-startup.yaml - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -357,7 +357,7 @@ should set securityContext when set in values: - args: - --diag-addr=0.0.0.0:3000 - --apply-on-startup=/etc/teleport/apply-on-startup.yaml - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent lifecycle: preStop: diff --git a/examples/chart/teleport-cluster/tests/__snapshot__/proxy_deployment_test.yaml.snap b/examples/chart/teleport-cluster/tests/__snapshot__/proxy_deployment_test.yaml.snap index ede729946fc32..96c27f840f828 100644 --- a/examples/chart/teleport-cluster/tests/__snapshot__/proxy_deployment_test.yaml.snap +++ b/examples/chart/teleport-cluster/tests/__snapshot__/proxy_deployment_test.yaml.snap @@ -5,7 +5,7 @@ should provision initContainer correctly when set in values: - wait - no-resolve - RELEASE-NAME-auth-v13.NAMESPACE.svc.cluster.local - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 name: wait-auth-update - args: - echo test @@ -62,7 +62,7 @@ should set nodeSelector when set in values: containers: - args: - --diag-addr=0.0.0.0:3000 - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -123,7 +123,7 @@ should set nodeSelector when set in values: - wait - no-resolve - RELEASE-NAME-auth-v13.NAMESPACE.svc.cluster.local - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 name: wait-auth-update nodeSelector: environment: security @@ -174,7 +174,7 @@ should set resources when set in values: containers: - args: - --diag-addr=0.0.0.0:3000 - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -242,7 +242,7 @@ should set resources when set in values: - wait - no-resolve - RELEASE-NAME-auth-v13.NAMESPACE.svc.cluster.local - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 name: wait-auth-update serviceAccountName: RELEASE-NAME-proxy terminationGracePeriodSeconds: 60 @@ -275,7 +275,7 @@ should set securityContext for initContainers when set in values: containers: - args: - --diag-addr=0.0.0.0:3000 - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -343,7 +343,7 @@ should set securityContext for initContainers when set in values: - wait - no-resolve - RELEASE-NAME-auth-v13.NAMESPACE.svc.cluster.local - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 name: wait-auth-update securityContext: allowPrivilegeEscalation: false @@ -383,7 +383,7 @@ should set securityContext when set in values: containers: - args: - --diag-addr=0.0.0.0:3000 - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent lifecycle: preStop: @@ -451,7 +451,7 @@ should set securityContext when set in values: - wait - no-resolve - RELEASE-NAME-auth-v13.NAMESPACE.svc.cluster.local - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 name: wait-auth-update securityContext: allowPrivilegeEscalation: false diff --git a/examples/chart/teleport-kube-agent/Chart.yaml b/examples/chart/teleport-kube-agent/Chart.yaml index 721f0d11b0318..31123d2d4b0a8 100644 --- a/examples/chart/teleport-kube-agent/Chart.yaml +++ b/examples/chart/teleport-kube-agent/Chart.yaml @@ -1,4 +1,4 @@ -.version: &version "14.3.9" +.version: &version "14.3.10" name: teleport-kube-agent apiVersion: v2 diff --git a/examples/chart/teleport-kube-agent/tests/__snapshot__/deployment_test.yaml.snap b/examples/chart/teleport-kube-agent/tests/__snapshot__/deployment_test.yaml.snap index 9f91613230546..eca0863c329fd 100644 --- a/examples/chart/teleport-kube-agent/tests/__snapshot__/deployment_test.yaml.snap +++ b/examples/chart/teleport-kube-agent/tests/__snapshot__/deployment_test.yaml.snap @@ -30,7 +30,7 @@ sets Deployment annotations when specified if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -103,7 +103,7 @@ sets Deployment labels when specified if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -163,7 +163,7 @@ sets Pod annotations when specified if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -223,7 +223,7 @@ sets Pod labels when specified if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -300,7 +300,7 @@ should add emptyDir for data when existingDataVolume is not set if action is Upg env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -361,7 +361,7 @@ should add insecureSkipProxyTLSVerify to args when set in values if action is Up env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -421,7 +421,7 @@ should correctly configure existingDataVolume when set if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -479,7 +479,7 @@ should expose diag port if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -551,7 +551,7 @@ should have multiple replicas when replicaCount is set (using .replicaCount, dep env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -623,7 +623,7 @@ should have multiple replicas when replicaCount is set (using highAvailability.r env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -683,7 +683,7 @@ should have one replica when replicaCount is not set if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -743,7 +743,7 @@ should mount extraVolumes and extraVolumeMounts if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -810,7 +810,7 @@ should mount tls.existingCASecretName and set environment when set in values if value: "true" - name: SSL_CERT_FILE value: /etc/teleport-tls-ca/ca.pem - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -880,7 +880,7 @@ should mount tls.existingCASecretName and set extra environment when set in valu value: http://username:password@my.proxy.host:3128 - name: SSL_CERT_FILE value: /etc/teleport-tls-ca/ca.pem - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -946,7 +946,7 @@ should provision initContainer correctly when set in values if action is Upgrade env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1042,7 +1042,7 @@ should set SecurityContext if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1122,7 +1122,7 @@ should set affinity when set in values if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1182,7 +1182,7 @@ should set default serviceAccountName when not set in values if action is Upgrad env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1255,7 +1255,7 @@ should set environment when extraEnv set in values if action is Upgrade: value: "true" - name: HTTPS_PROXY value: http://username:password@my.proxy.host:3128 - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1375,7 +1375,7 @@ should set imagePullPolicy when set in values if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: Always livenessProbe: failureThreshold: 6 @@ -1435,7 +1435,7 @@ should set nodeSelector if set in values if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1497,7 +1497,7 @@ should set not set priorityClassName when not set in values if action is Upgrade env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1569,7 +1569,7 @@ should set preferred affinity when more than one replica is used if action is Up env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1629,7 +1629,7 @@ should set priorityClassName when set in values if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1690,7 +1690,7 @@ should set probeTimeoutSeconds when set in values if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1760,7 +1760,7 @@ should set required affinity when highAvailability.requireAntiAffinity is set if env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1820,7 +1820,7 @@ should set resources when set in values if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1887,7 +1887,7 @@ should set serviceAccountName when set in values if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1947,7 +1947,7 @@ should set tolerations when set in values if action is Upgrade: env: - name: TELEPORT_INSTALL_METHOD_HELM_KUBE_AGENT value: "true" - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 diff --git a/examples/chart/teleport-kube-agent/tests/__snapshot__/job_test.yaml.snap b/examples/chart/teleport-kube-agent/tests/__snapshot__/job_test.yaml.snap index 0e2931b8d7cbc..fed264b4b3706 100644 --- a/examples/chart/teleport-kube-agent/tests/__snapshot__/job_test.yaml.snap +++ b/examples/chart/teleport-kube-agent/tests/__snapshot__/job_test.yaml.snap @@ -25,7 +25,7 @@ should create ServiceAccount for post-delete hook by default: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent name: post-delete-job securityContext: @@ -104,7 +104,7 @@ should not create ServiceAccount for post-delete hook if serviceAccount.create i fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent name: post-delete-job securityContext: @@ -132,7 +132,7 @@ should not create ServiceAccount, Role or RoleBinding for post-delete hook if se fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent name: post-delete-job securityContext: @@ -160,7 +160,7 @@ should set nodeSelector in post-delete hook: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent name: post-delete-job securityContext: @@ -190,7 +190,7 @@ should set securityContext in post-delete hook: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent name: post-delete-job securityContext: diff --git a/examples/chart/teleport-kube-agent/tests/__snapshot__/statefulset_test.yaml.snap b/examples/chart/teleport-kube-agent/tests/__snapshot__/statefulset_test.yaml.snap index 7068c4fb54bb2..29b935f4ac5e0 100644 --- a/examples/chart/teleport-kube-agent/tests/__snapshot__/statefulset_test.yaml.snap +++ b/examples/chart/teleport-kube-agent/tests/__snapshot__/statefulset_test.yaml.snap @@ -16,7 +16,7 @@ sets Pod annotations when specified: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -84,7 +84,7 @@ sets Pod labels when specified: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -176,7 +176,7 @@ sets StatefulSet labels when specified: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -272,7 +272,7 @@ should add insecureSkipProxyTLSVerify to args when set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -340,7 +340,7 @@ should add volumeClaimTemplate for data volume when using StatefulSet and action fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -428,7 +428,7 @@ should add volumeClaimTemplate for data volume when using StatefulSet and is Fre fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -506,7 +506,7 @@ should add volumeMount for data volume when using StatefulSet: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -574,7 +574,7 @@ should expose diag port: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -642,7 +642,7 @@ should generate Statefulset when storage is disabled and mode is a Upgrade: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -724,7 +724,7 @@ should have multiple replicas when replicaCount is set (using .replicaCount, dep fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -804,7 +804,7 @@ should have multiple replicas when replicaCount is set (using highAvailability.r fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -872,7 +872,7 @@ should have one replica when replicaCount is not set: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -940,7 +940,7 @@ should install Statefulset when storage is disabled and mode is a Fresh Install: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1010,7 +1010,7 @@ should mount extraVolumes and extraVolumeMounts: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1085,7 +1085,7 @@ should mount tls.existingCASecretName and set environment when set in values: value: RELEASE-NAME - name: SSL_CERT_FILE value: /etc/teleport-tls-ca/ca.pem - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1165,7 +1165,7 @@ should mount tls.existingCASecretName and set extra environment when set in valu value: /etc/teleport-tls-ca/ca.pem - name: HTTPS_PROXY value: http://username:password@my.proxy.host:3128 - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1241,7 +1241,7 @@ should not add emptyDir for data when using StatefulSet: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1309,7 +1309,7 @@ should provision initContainer correctly when set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1413,7 +1413,7 @@ should set SecurityContext: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1501,7 +1501,7 @@ should set affinity when set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1569,7 +1569,7 @@ should set default serviceAccountName when not set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1650,7 +1650,7 @@ should set environment when extraEnv set in values: value: RELEASE-NAME - name: HTTPS_PROXY value: http://username:password@my.proxy.host:3128 - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1786,7 +1786,7 @@ should set imagePullPolicy when set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: Always livenessProbe: failureThreshold: 6 @@ -1854,7 +1854,7 @@ should set nodeSelector if set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -1936,7 +1936,7 @@ should set preferred affinity when more than one replica is used: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -2004,7 +2004,7 @@ should set probeTimeoutSeconds when set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -2082,7 +2082,7 @@ should set required affinity when highAvailability.requireAntiAffinity is set: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -2150,7 +2150,7 @@ should set resources when set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -2225,7 +2225,7 @@ should set serviceAccountName when set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -2293,7 +2293,7 @@ should set storage.requests when set in values and action is an Upgrade: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -2361,7 +2361,7 @@ should set storage.storageClassName when set in values and action is an Upgrade: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -2429,7 +2429,7 @@ should set tolerations when set in values: fieldPath: metadata.namespace - name: RELEASE_NAME value: RELEASE-NAME - image: public.ecr.aws/gravitational/teleport-distroless:14.3.9 + image: public.ecr.aws/gravitational/teleport-distroless:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 diff --git a/examples/chart/teleport-kube-agent/tests/__snapshot__/updater_deployment_test.yaml.snap b/examples/chart/teleport-kube-agent/tests/__snapshot__/updater_deployment_test.yaml.snap index 977ca159ed261..7e05cb055a72d 100644 --- a/examples/chart/teleport-kube-agent/tests/__snapshot__/updater_deployment_test.yaml.snap +++ b/examples/chart/teleport-kube-agent/tests/__snapshot__/updater_deployment_test.yaml.snap @@ -27,7 +27,7 @@ sets the affinity: - --base-image=public.ecr.aws/gravitational/teleport-distroless - --version-server=https://my-custom-version-server/v1 - --version-channel=custom/preview - image: public.ecr.aws/gravitational/teleport-kube-agent-updater:14.3.9 + image: public.ecr.aws/gravitational/teleport-kube-agent-updater:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 @@ -71,7 +71,7 @@ sets the tolerations: - --base-image=public.ecr.aws/gravitational/teleport-distroless - --version-server=https://my-custom-version-server/v1 - --version-channel=custom/preview - image: public.ecr.aws/gravitational/teleport-kube-agent-updater:14.3.9 + image: public.ecr.aws/gravitational/teleport-kube-agent-updater:14.3.10 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 6 diff --git a/lib/events/emitter.go b/lib/events/emitter.go index 60450de5e4e43..9e69de95675ad 100644 --- a/lib/events/emitter.go +++ b/lib/events/emitter.go @@ -246,9 +246,9 @@ func (w *WriterEmitter) EmitAuditEvent(ctx context.Context, event apievents.Audi // NewLoggingEmitter returns an emitter that logs all events to the console // with the info level. Events are only logged for self-hosted installations, // Teleport Cloud treats this as a no-op. -func NewLoggingEmitter() *LoggingEmitter { +func NewLoggingEmitter(cloud bool) *LoggingEmitter { return &LoggingEmitter{ - emit: !modules.GetModules().Features().Cloud, + emit: !(modules.GetModules().Features().Cloud || cloud), } } diff --git a/lib/service/service.go b/lib/service/service.go index 0bd7c8a719af3..707d8e7d75f44 100644 --- a/lib/service/service.go +++ b/lib/service/service.go @@ -1763,7 +1763,7 @@ func (process *TeleportProcess) initAuthService() error { } checkingEmitter, err := events.NewCheckingEmitter(events.CheckingEmitterConfig{ - Inner: events.NewMultiEmitter(events.NewLoggingEmitter(), emitter), + Inner: events.NewMultiEmitter(events.NewLoggingEmitter(process.getClusterFeatures().Cloud), emitter), Clock: process.Clock, ClusterName: clusterName, }) @@ -2412,7 +2412,7 @@ func (process *TeleportProcess) proxyPublicAddr() utils.NetAddr { // It is caller's responsibility to call Close on the emitter once done. func (process *TeleportProcess) NewAsyncEmitter(clt apievents.Emitter) (*events.AsyncEmitter, error) { emitter, err := events.NewCheckingEmitter(events.CheckingEmitterConfig{ - Inner: events.NewMultiEmitter(events.NewLoggingEmitter(), clt), + Inner: events.NewMultiEmitter(events.NewLoggingEmitter(process.getClusterFeatures().Cloud), clt), Clock: process.Clock, }) if err != nil {