fix(secrets-backup): 🔄 sync simplified manifest from template
Remove client-side openssl encryption. OBS SSE-KMS handles encryption at rest. Updated: no apk add openssl, no openssl enc step, no secrets-backup-config Secret, upload .tar.gz directly. Image tag bumped to 1.0.1 (built without openssl). Ref: IPCEICIS-9317
This commit is contained in:
parent
900c1f6c80
commit
8939b4f32b
1 changed files with 5 additions and 30 deletions
|
|
@ -29,17 +29,6 @@ roleRef:
|
||||||
name: secrets-backup-reader
|
name: secrets-backup-reader
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
---
|
---
|
||||||
apiVersion: v1
|
|
||||||
kind: Secret
|
|
||||||
metadata:
|
|
||||||
name: secrets-backup-config
|
|
||||||
namespace: gitea
|
|
||||||
type: Opaque
|
|
||||||
stringData:
|
|
||||||
# IMPORTANT: Replace this placeholder with a strong passphrase per environment.
|
|
||||||
# This secret should be managed via external-secrets or manually set after initial deploy.
|
|
||||||
encryption-passphrase: "CHANGE-ME-SET-PER-ENVIRONMENT"
|
|
||||||
---
|
|
||||||
apiVersion: batch/v1
|
apiVersion: batch/v1
|
||||||
kind: CronJob
|
kind: CronJob
|
||||||
metadata:
|
metadata:
|
||||||
|
|
@ -61,7 +50,7 @@ spec:
|
||||||
serviceAccountName: secrets-backup
|
serviceAccountName: secrets-backup
|
||||||
containers:
|
containers:
|
||||||
- name: secrets-backup
|
- name: secrets-backup
|
||||||
image: alpine/k8s:1.32.0
|
image: edp.buildth.ing/devfw-cicd/secrets-backup:1.0.1
|
||||||
imagePullPolicy: IfNotPresent
|
imagePullPolicy: IfNotPresent
|
||||||
env:
|
env:
|
||||||
- name: AWS_ACCESS_KEY_ID
|
- name: AWS_ACCESS_KEY_ID
|
||||||
|
|
@ -74,11 +63,6 @@ spec:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: forgejo-cloud-credentials
|
name: forgejo-cloud-credentials
|
||||||
key: secret-key
|
key: secret-key
|
||||||
- name: ENCRYPTION_PASSPHRASE
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: secrets-backup-config
|
|
||||||
key: encryption-passphrase
|
|
||||||
- name: SOURCE_BUCKET
|
- name: SOURCE_BUCKET
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
|
|
@ -92,9 +76,6 @@ spec:
|
||||||
- |
|
- |
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
# Ensure openssl is available (not bundled in alpine/k8s image)
|
|
||||||
apk add --no-cache openssl --quiet
|
|
||||||
|
|
||||||
TIMESTAMP=$(date +%Y%m%d-%H%M%S)
|
TIMESTAMP=$(date +%Y%m%d-%H%M%S)
|
||||||
BACKUP_DIR="/tmp/secrets-backup-${TIMESTAMP}"
|
BACKUP_DIR="/tmp/secrets-backup-${TIMESTAMP}"
|
||||||
NAMESPACES="argocd cert-manager external-secrets"
|
NAMESPACES="argocd cert-manager external-secrets"
|
||||||
|
|
@ -110,20 +91,14 @@ spec:
|
||||||
> "${BACKUP_DIR}/${NS}-secrets.json"
|
> "${BACKUP_DIR}/${NS}-secrets.json"
|
||||||
done
|
done
|
||||||
|
|
||||||
echo "=== Encrypting backup with AES-256-CBC ==="
|
echo "=== Creating compressed archive ==="
|
||||||
ARCHIVE="${BACKUP_DIR}/secrets-backup-${TIMESTAMP}.tar.gz"
|
ARCHIVE="${BACKUP_DIR}/secrets-backup-${TIMESTAMP}.tar.gz"
|
||||||
tar -czf "${ARCHIVE}" -C "${BACKUP_DIR}" \
|
tar -czf "${ARCHIVE}" -C "${BACKUP_DIR}" \
|
||||||
$(ls "${BACKUP_DIR}"/*.json 2>/dev/null | xargs -n1 basename)
|
$(ls "${BACKUP_DIR}"/*.json 2>/dev/null | xargs -n1 basename)
|
||||||
|
|
||||||
ENCRYPTED="${BACKUP_DIR}/secrets-backup-${TIMESTAMP}.tar.gz.enc"
|
echo "=== Uploading to OBS (SSE-KMS encryption at rest) ==="
|
||||||
openssl enc -aes-256-cbc -salt -pbkdf2 -iter 100000 \
|
aws s3 cp "${ARCHIVE}" \
|
||||||
-in "${ARCHIVE}" \
|
"s3://${SOURCE_BUCKET}/cluster-secrets-backup/${TIMESTAMP}/secrets-backup.tar.gz" \
|
||||||
-out "${ENCRYPTED}" \
|
|
||||||
-pass env:ENCRYPTION_PASSPHRASE
|
|
||||||
|
|
||||||
echo "=== Uploading to OBS ==="
|
|
||||||
aws s3 cp "${ENCRYPTED}" \
|
|
||||||
"s3://${SOURCE_BUCKET}/cluster-secrets-backup/${TIMESTAMP}/secrets-backup.tar.gz.enc" \
|
|
||||||
--endpoint-url "https://${OBS_ENDPOINT}"
|
--endpoint-url "https://${OBS_ENDPOINT}"
|
||||||
|
|
||||||
echo "=== Cleanup ==="
|
echo "=== Cleanup ==="
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue