Merge branch 'develop' into 'master'
add vault auto unseal See merge request ldc-web/cluster-k8s!37
This commit is contained in:
commit
3151fc4106
3 changed files with 25 additions and 8 deletions
|
|
@ -0,0 +1,24 @@
|
|||
---
|
||||
apiVersion: external-secrets.io/v1beta1
|
||||
kind: ExternalSecret
|
||||
metadata:
|
||||
name: docker-registry-credentials
|
||||
namespace: common-services
|
||||
spec:
|
||||
refreshInterval: "15s"
|
||||
secretStoreRef:
|
||||
name: vault-secret-store
|
||||
kind: ClusterSecretStore
|
||||
target:
|
||||
name: docker-registry-credentials
|
||||
template:
|
||||
engineVersion: v2
|
||||
type: kubernetes.io/dockerconfigjson
|
||||
data:
|
||||
.dockerconfigjson: "{{ .config }}"
|
||||
data:
|
||||
- secretKey: config
|
||||
remoteRef:
|
||||
key: secret/docker
|
||||
property: auth_config
|
||||
decodingStrategy: Base64
|
||||
|
|
@ -6,6 +6,7 @@ resources:
|
|||
- flux-resources.yaml
|
||||
- gitlab-agent.yaml
|
||||
- gitlab-runner.yaml
|
||||
- hashicorp-vault.yaml
|
||||
- mariadb.yaml
|
||||
- prometheus-stack.yaml
|
||||
- review.yaml
|
||||
|
|
|
|||
|
|
@ -86,14 +86,6 @@ spec:
|
|||
enabled: true
|
||||
|
||||
extraObjects:
|
||||
- apiVersion: traefik.io/v1alpha1
|
||||
kind: Middleware
|
||||
metadata:
|
||||
name: auth
|
||||
namespace: common-services
|
||||
spec:
|
||||
basicAuth:
|
||||
secret: traefik-auth-ldc-oe
|
||||
- apiVersion: traefik.io/v1alpha1 # Redirect www URLs to their no-www equivalent
|
||||
kind: Middleware
|
||||
metadata:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue