fix(bootstrap): external-secrets

buroa · Jan 7, 2025 · 6f5f532 · 6f5f532
1 parent 04e0d24
commit 6f5f532
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 9 deletions.
diff --git a/...ity/external-secrets/app/helmrelease.yaml → ...ets/external-secrets/app/helmrelease.yaml b/...ity/external-secrets/app/helmrelease.yaml → ...ets/external-secrets/app/helmrelease.yaml
diff --git a/...y/external-secrets/app/kustomization.yaml → ...s/external-secrets/app/kustomization.yaml b/...y/external-secrets/app/kustomization.yaml → ...s/external-secrets/app/kustomization.yaml
diff --git a/...es/apps/security/external-secrets/ks.yaml → ...external-secrets/external-secrets/ks.yaml b/...es/apps/security/external-secrets/ks.yaml → ...external-secrets/external-secrets/ks.yaml
@@ -5,11 +5,11 @@ metadata:
   name: &app external-secrets
   namespace: flux-system
 spec:
-  targetNamespace: security
+  targetNamespace: external-secrets
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
-  path: ./kubernetes/apps/security/external-secrets/app
+  path: ./kubernetes/apps/external-secrets/external-secrets/app
   prune: true
   sourceRef:
     kind: GitRepository
@@ -25,13 +25,13 @@ metadata:
   name: &app external-secrets-stores
   namespace: flux-system
 spec:
-  targetNamespace: security
+  targetNamespace: external-secrets
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets
-  path: ./kubernetes/apps/security/external-secrets/stores
+  path: ./kubernetes/apps/external-secrets/external-secrets/stores
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/...xternal-secrets/stores/kustomization.yaml → ...xternal-secrets/stores/kustomization.yaml b/...xternal-secrets/stores/kustomization.yaml → ...xternal-secrets/stores/kustomization.yaml
diff --git a/...l-secrets/stores/onepassword-connect.yaml → ...l-secrets/stores/onepassword-connect.yaml b/...l-secrets/stores/onepassword-connect.yaml → ...l-secrets/stores/onepassword-connect.yaml
@@ -6,12 +6,12 @@ metadata:
 spec:
   provider:
     onepassword:
-      connectHost: http://onepassword-connect.security.svc.cluster.local
+      connectHost: http://onepassword-connect.external-secrets.svc.cluster.local
       vaults:
         K8s: 1
       auth:
         secretRef:
           connectTokenSecretRef:
             name: onepassword-connect-secret
             key: token
-            namespace: security
+            namespace: external-secrets
diff --git a/kubernetes/apps/security/kustomization.yaml → .../apps/external-secrets/kustomization.yaml b/kubernetes/apps/security/kustomization.yaml → .../apps/external-secrets/kustomization.yaml
diff --git a/kubernetes/apps/security/namespace.yaml → ...etes/apps/external-secrets/namespace.yaml b/kubernetes/apps/security/namespace.yaml → ...etes/apps/external-secrets/namespace.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: security
+  name: external-secrets
   annotations:
     kustomize.toolkit.fluxcd.io/prune: disabled
   labels:

diff --git a/.../onepassword-connect/app/helmrelease.yaml → .../onepassword-connect/app/helmrelease.yaml b/.../onepassword-connect/app/helmrelease.yaml → .../onepassword-connect/app/helmrelease.yaml
diff --git a/...nepassword-connect/app/kustomization.yaml → ...nepassword-connect/app/kustomization.yaml b/...nepassword-connect/app/kustomization.yaml → ...nepassword-connect/app/kustomization.yaml
diff --git a/...apps/security/onepassword-connect/ks.yaml → ...ernal-secrets/onepassword-connect/ks.yaml b/...apps/security/onepassword-connect/ks.yaml → ...ernal-secrets/onepassword-connect/ks.yaml
@@ -5,13 +5,13 @@ metadata:
   name: &app onepassword-connect
   namespace: flux-system
 spec:
-  targetNamespace: security
+  targetNamespace: external-secrets
   commonMetadata:
     labels:
       app.kubernetes.io/name: *app
   dependsOn:
     - name: external-secrets
-  path: ./kubernetes/apps/security/onepassword-connect/app
+  path: ./kubernetes/apps/external-secrets/onepassword-connect/app
   prune: true
   sourceRef:
     kind: GitRepository

diff --git a/...s/bootstrap/apps/external-secrets.yaml.j2 → ...rnetes/bootstrap/apps/external-secrets.j2 b/...s/bootstrap/apps/external-secrets.yaml.j2 → ...rnetes/bootstrap/apps/external-secrets.j2