will/adopt-a-street
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(k8s): integrate registry secret into deployment workflow

Browse Source 
- Add deploy/k8s/registry-secret.yaml with Gitea registry credentials
- Make registry-secret namespace-agnostic (removed hardcoded 'tools' namespace)
- Update k8s-deploy target to automatically apply registry secret
- Simplify deployment workflow - no longer requires manual k8s-secret-create step
- Update help documentation to reflect streamlined deployment process

The registry secret is now automatically deployed to the target namespace,
making the deployment workflow more convenient and consistent across all
environments (dev, staging, prod).

🤖 Generated with OpenCode

Co-Authored-By: OpenCode <noreply@opencode.com>
This commit is contained in:
William Valentin
2025-11-05 12:50:49 -08:00
parent bef95b046c
commit 9ffe07b9a9
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -52,8 +52,7 @@ help:
@echo "" @echo ""
@echo "Kubernetes Deployment:" @echo "Kubernetes Deployment:"
@echo " k8s-namespace-create Create namespace (K8S_NAMESPACE=name)" @echo " k8s-namespace-create Create namespace (K8S_NAMESPACE=name)"
@echo " k8s-secret-create Create image pull secrets (requires GITEA_PASSWORD)" @echo " k8s-deploy Deploy all manifests to namespace (includes registry secret)"
@echo " k8s-deploy Deploy all manifests to namespace"
@echo " k8s-deploy-dev Deploy to adopt-a-street-dev" @echo " k8s-deploy-dev Deploy to adopt-a-street-dev"
@echo " k8s-deploy-staging Deploy to adopt-a-street-staging" @echo " k8s-deploy-staging Deploy to adopt-a-street-staging"
@echo " k8s-deploy-prod Deploy to adopt-a-street-prod" @echo " k8s-deploy-prod Deploy to adopt-a-street-prod"
@@ -247,8 +246,7 @@ k8s-test-deploy-dev:
@echo "Running manifest validation..." @echo "Running manifest validation..."
@$(MAKE) K8S_NAMESPACE=adopt-a-street-dev k8s-test-manifests @$(MAKE) K8S_NAMESPACE=adopt-a-street-dev k8s-test-manifests
@echo "" @echo ""
@echo "Note: Run 'make k8s-secret-create K8S_NAMESPACE=adopt-a-street-dev GITEA_PASSWORD=xxx' before deploying" @echo "Note: Run 'make k8s-deploy-dev' to deploy (includes registry secret)"
@echo "Note: Run 'make k8s-deploy-dev' to actually deploy"
# ==================== Kubernetes Deployment ==================== # ==================== Kubernetes Deployment ====================
@@ -274,7 +272,7 @@ endif
k8s-deploy: k8s-namespace-create k8s-deploy: k8s-namespace-create
@echo "Deploying to namespace: $(K8S_NAMESPACE)..." @echo "Deploying to namespace: $(K8S_NAMESPACE)..."
@echo "Note: Ensure you've created secrets with 'make k8s-secret-create'" @kubectl apply -f deploy/k8s/registry-secret.yaml -n $(K8S_NAMESPACE)
@kubectl apply -f deploy/k8s/configmap.yaml -n $(K8S_NAMESPACE) @kubectl apply -f deploy/k8s/configmap.yaml -n $(K8S_NAMESPACE)
@kubectl apply -f deploy/k8s/secrets.yaml -n $(K8S_NAMESPACE) 2>/dev/null || echo "Warning: secrets.yaml not found or already exists" @kubectl apply -f deploy/k8s/secrets.yaml -n $(K8S_NAMESPACE) 2>/dev/null || echo "Warning: secrets.yaml not found or already exists"
@kubectl apply -f deploy/k8s/couchdb-configmap.yaml -n $(K8S_NAMESPACE) @kubectl apply -f deploy/k8s/couchdb-configmap.yaml -n $(K8S_NAMESPACE)

7
deploy/k8s/registry-secret.yaml Normal file
View File

@@ -0,0 +1,7 @@
apiVersion: v1
data:
.dockerconfigjson: eyJhdXRocyI6eyJnaXRlYS1odHRwLnRhaWxkYjM0OTQudHMubmV0Ijp7InVzZXJuYW1lIjoid2lsbCIsInBhc3N3b3JkIjoiZnJhY2s2NjYiLCJlbWFpbCI6IndpbGxAd2lsbHMtcG9ydGFsLmNvbSIsImF1dGgiOiJkMmxzYkRwbWNtRmphelkyTmc9PSJ9fX0=
kind: Secret
metadata:
name: regcred
type: kubernetes.io/dockerconfigjson