diff --git a/velero/kustomization.yaml b/velero/kustomization.yaml index 60924e2..b8b32ed 100644 --- a/velero/kustomization.yaml +++ b/velero/kustomization.yaml @@ -2,8 +2,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - # argocd.yaml files은 수동으로 관리 (순환 참조 방지) - namespace.yaml - - external-secret.yaml - - vault/velero-ui-secret.yaml + - vault/velero-secrets.yaml - ingress.yaml diff --git a/velero/external-secret.yaml b/velero/vault/velero-secrets.yaml similarity index 57% rename from velero/external-secret.yaml rename to velero/vault/velero-secrets.yaml index 5acef85..46f5cbb 100644 --- a/velero/external-secret.yaml +++ b/velero/vault/velero-secrets.yaml @@ -5,11 +5,9 @@ metadata: namespace: velero spec: refreshInterval: 1h - secretStoreRef: - name: vault-backend kind: ClusterSecretStore - + name: vault-backend target: name: velero-s3-credentials creationPolicy: Owner @@ -20,14 +18,36 @@ spec: [default] aws_access_key_id={{ .minioAccessKey }} aws_secret_access_key="{{ .minioSecretKey }}" - data: - secretKey: minioAccessKey remoteRef: key: databases/minio property: ROOT_USER - - secretKey: minioSecretKey remoteRef: key: databases/minio property: ROOT_PASSWORD + +--- +apiVersion: external-secrets.io/v1beta1 +kind: ExternalSecret +metadata: + name: velero-ui-secret + namespace: velero +spec: + refreshInterval: 1h + secretStoreRef: + kind: ClusterSecretStore + name: vault-backend + target: + name: velero-ui-secret + creationPolicy: Owner + data: + - secretKey: username + remoteRef: + key: cluster-infrastructure/velero + property: UI_USERNAME + - secretKey: password + remoteRef: + key: cluster-infrastructure/velero + property: UI_PASSWORD diff --git a/velero/vault/velero-ui-secret.yaml b/velero/vault/velero-ui-secret.yaml deleted file mode 100644 index 415b305..0000000 --- a/velero/vault/velero-ui-secret.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: external-secrets.io/v1beta1 -kind: ExternalSecret -metadata: - name: velero-ui-secret - namespace: velero -spec: - refreshInterval: 1h - secretStoreRef: - kind: ClusterSecretStore - name: vault-backend - target: - name: velero-ui-secret - creationPolicy: Owner - data: - - secretKey: username - remoteRef: - key: cluster-infrastructure/velero - property: UI_USERNAME - - secretKey: password - remoteRef: - key: cluster-infrastructure/velero - property: UI_PASSWORD -