From d24276ebe0ad02efa6cd70a658930aaf8222a382 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 5 Nov 2023 11:22:58 +0100 Subject: [PATCH] Fixed not installed template --- .../crds/secrets.hashicorp.com_hcpauths.yaml | 100 ------------------ .../test/templates/_helpers.tpl | 3 - .../test/templates/hcpauth.yaml | 2 - 3 files changed, 105 deletions(-) delete mode 100644 argocd/vault-secrets-operator-config/test/crds/secrets.hashicorp.com_hcpauths.yaml diff --git a/argocd/vault-secrets-operator-config/test/crds/secrets.hashicorp.com_hcpauths.yaml b/argocd/vault-secrets-operator-config/test/crds/secrets.hashicorp.com_hcpauths.yaml deleted file mode 100644 index 0d639f9..0000000 --- a/argocd/vault-secrets-operator-config/test/crds/secrets.hashicorp.com_hcpauths.yaml +++ /dev/null @@ -1,100 +0,0 @@ -# Copyright (c) HashiCorp, Inc. -# SPDX-License-Identifier: BUSL-1.1 - ---- -apiVersion: apiextensions.k8s.io/v1 -kind: CustomResourceDefinition -metadata: - annotations: - controller-gen.kubebuilder.io/version: v0.13.0 - name: hcpauths.secrets.hashicorp.com -spec: - group: secrets.hashicorp.com - names: - kind: HCPAuth - listKind: HCPAuthList - plural: hcpauths - singular: hcpauth - scope: Namespaced - versions: - - name: v1beta1 - schema: - openAPIV3Schema: - description: HCPAuth is the Schema for the hcpauths API - properties: - apiVersion: - description: 'APIVersion defines the versioned schema of this representation - of an object. Servers should convert recognized schemas to the latest - internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' - type: string - kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' - type: string - metadata: - type: object - spec: - description: HCPAuthSpec defines the desired state of HCPAuth - properties: - allowedNamespaces: - description: 'AllowedNamespaces Kubernetes Namespaces which are allow-listed - for use with this AuthMethod. This field allows administrators to - customize which Kubernetes namespaces are authorized to use with - this AuthMethod. While Vault will still enforce its own rules, this - has the added configurability of restricting which HCPAuthMethods - can be used by which namespaces. Accepted values: []{"*"} - wildcard, - all namespaces. []{"a", "b"} - list of namespaces. unset - disallow - all namespaces except the Operator''s the HCPAuthMethod''s namespace, - this is the default behavior.' - items: - type: string - type: array - method: - default: servicePrincipal - description: Method to use when authenticating to Vault. - enum: - - servicePrincipal - type: string - organizationID: - description: OrganizationID of the HCP organization. - type: string - projectID: - description: ProjectID of the HCP project. - type: string - servicePrincipal: - description: ServicePrincipal provides the necessary configuration - for authenticating to HCP using a service principal. For security - reasons, only project-level service principals should ever be used. - properties: - secretRef: - description: 'SecretRef is the name of a Kubernetes secret in - the consumer''s (VDS/VSS/PKI/HCP) namespace which provides the - HCP ServicePrincipal clientID, and clientSecret. The secret - data must have the following structure { "clientID": "clientID", - "clientSecret": "clientSecret", }' - type: string - required: - - secretRef - type: object - required: - - organizationID - - projectID - type: object - status: - description: HCPAuthStatus defines the observed state of HCPAuth - properties: - error: - type: string - valid: - description: Valid auth mechanism. - type: boolean - required: - - error - - valid - type: object - type: object - served: true - storage: true - subresources: - status: {} diff --git a/argocd/vault-secrets-operator-config/test/templates/_helpers.tpl b/argocd/vault-secrets-operator-config/test/templates/_helpers.tpl index bc60ae6..18979a7 100644 --- a/argocd/vault-secrets-operator-config/test/templates/_helpers.tpl +++ b/argocd/vault-secrets-operator-config/test/templates/_helpers.tpl @@ -36,9 +36,6 @@ Common labels {{- define "template.labels" -}} helm.sh/chart: {{ include "template.chart" . }} {{ include "template.selectorLabels" . }} -{{- if or .Chart.AppVersion .Values.image.tag }} -app.kubernetes.io/version: {{ .Values.image.tag | default .Chart.AppVersion | quote }} -{{- end }} app.kubernetes.io/managed-by: {{ .Release.Service }} {{- end }} diff --git a/argocd/vault-secrets-operator-config/test/templates/hcpauth.yaml b/argocd/vault-secrets-operator-config/test/templates/hcpauth.yaml index bf2b98f..51f4873 100644 --- a/argocd/vault-secrets-operator-config/test/templates/hcpauth.yaml +++ b/argocd/vault-secrets-operator-config/test/templates/hcpauth.yaml @@ -1,4 +1,3 @@ -{{- define "template.hcpauth" -}} apiVersion: secrets.hashicorp.com/v1beta1 kind: HCPAuth metadata: @@ -11,4 +10,3 @@ spec: projectID: {{ .Values.projectId }} servicePrincipal: secretRef: vault-service-principal -{{- end }} \ No newline at end of file