From 9c02504c9871560c6bf93882a9ff3dfc66f3c992 Mon Sep 17 00:00:00 2001 From: Jonny Ervine Date: Sun, 19 Nov 2023 11:37:36 +0800 Subject: [PATCH] Clean up charts --- teleport-cluster/Chart.yaml | 6 +++--- .../charts/teleport-operator/Chart.yaml | 4 ++-- ...resources.teleport.dev_provisiontokens.yaml | 18 ++++++++++++++++++ .../auth_deployment_test.yaml.snap | 10 +++++----- .../proxy_deployment_test.yaml.snap | 18 +++++++++--------- 5 files changed, 37 insertions(+), 19 deletions(-) diff --git a/teleport-cluster/Chart.yaml b/teleport-cluster/Chart.yaml index 81a4adf..84293b5 100644 --- a/teleport-cluster/Chart.yaml +++ b/teleport-cluster/Chart.yaml @@ -1,13 +1,13 @@ apiVersion: v2 -appVersion: 14.1.1 +appVersion: 14.1.5 dependencies: - condition: installCRDs,operator.enabled name: teleport-operator repository: "" - version: 14.1.1 + version: 14.1.5 description: Teleport is an access platform for your infrastructure icon: https://goteleport.com/images/logos/logo-teleport-square.svg keywords: - Teleport name: teleport-cluster -version: 14.1.1 +version: 14.1.5 diff --git a/teleport-cluster/charts/teleport-operator/Chart.yaml b/teleport-cluster/charts/teleport-operator/Chart.yaml index 47406ac..31ae5ca 100644 --- a/teleport-cluster/charts/teleport-operator/Chart.yaml +++ b/teleport-cluster/charts/teleport-operator/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: 14.1.1 +appVersion: 14.1.5 description: Teleport Operator provides management of select Teleport resources. icon: https://goteleport.com/images/logos/logo-teleport-square.svg keywords: - Teleport name: teleport-operator -version: 14.1.1 +version: 14.1.5 diff --git a/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_provisiontokens.yaml b/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_provisiontokens.yaml index 9d4a18d..6727759 100644 --- a/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_provisiontokens.yaml +++ b/teleport-cluster/charts/teleport-operator/templates/resources.teleport.dev_provisiontokens.yaml @@ -192,20 +192,38 @@ spec: must match one allow rule to use this token. items: properties: + ci_config_ref_uri: + type: string + ci_config_sha: + type: string + deployment_tier: + type: string environment: type: string + environment_protected: + type: boolean namespace_path: type: string pipeline_source: type: string project_path: type: string + project_visibility: + type: string ref: type: string + ref_protected: + type: boolean ref_type: type: string sub: type: string + user_email: + type: string + user_id: + type: string + user_login: + type: string type: object nullable: true type: array diff --git a/teleport-cluster/tests/__snapshot__/auth_deployment_test.yaml.snap b/teleport-cluster/tests/__snapshot__/auth_deployment_test.yaml.snap index 482209c..4f85c86 100644 --- a/teleport-cluster/tests/__snapshot__/auth_deployment_test.yaml.snap +++ b/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.1.1 + image: public.ecr.aws/gravitational/teleport-operator:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 imagePullPolicy: IfNotPresent lifecycle: preStop: diff --git a/teleport-cluster/tests/__snapshot__/proxy_deployment_test.yaml.snap b/teleport-cluster/tests/__snapshot__/proxy_deployment_test.yaml.snap index c3ade82..8a7d6d4 100644 --- a/teleport-cluster/tests/__snapshot__/proxy_deployment_test.yaml.snap +++ b/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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 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.1.1 + image: public.ecr.aws/gravitational/teleport-distroless:14.1.5 name: wait-auth-update securityContext: allowPrivilegeEscalation: false