From 565da979285faa539e0fb4f7448600957cccd1a3 Mon Sep 17 00:00:00 2001 From: Denis Patrakeev Date: Mon, 24 Feb 2025 13:56:29 +0300 Subject: [PATCH] [DO-1600] Move namespace prod to avroid-prod (!36) [DO-1600] Co-authored-by: denis.patrakeev Reviewed-on: https://git.avroid.tech/K8s/k8s-configs/pulls/36 Reviewed-by: Vasiliy Chipizhin Reviewed-by: Rustam Tagaev --- .../argocd-apps-avroid-prod.yaml} | 12 ++++++------ .../mermaid/argocd-apps-mermaid-app.yaml | 6 +++--- .../mermaid/argocd-apps-plantuml-network-policy.yaml | 2 +- .../mermaid/kustomize/kustomization.yaml | 0 .../mermaid/kustomize/mermaid-deployment.yaml | 0 .../mermaid/kustomize/mermaid-ingress.yaml | 0 .../mermaid/kustomize/mermaid-service.yaml | 0 .../plantuml/argocd-apps-plantuml-app.yaml | 6 +++--- .../argocd-apps-plantuml-network-policy.yaml | 2 +- .../diagrams-tools}/plantuml/values-ovveride.yaml | 0 .../monitoring}/karma/argocd-apps-karma-app.yaml | 6 +++--- .../karma/argocd-apps-karma-network-policy.yaml | 4 ++-- .../monitoring}/karma/values-ovveride.yaml | 0 13 files changed, 19 insertions(+), 19 deletions(-) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod/argocd-apps-prod.yaml => avroid-prod/argocd-apps-avroid-prod.yaml} (88%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/diagrams-tools}/mermaid/argocd-apps-mermaid-app.yaml (87%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/diagrams-tools}/mermaid/argocd-apps-plantuml-network-policy.yaml (93%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/diagrams-tools}/mermaid/kustomize/kustomization.yaml (100%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/diagrams-tools}/mermaid/kustomize/mermaid-deployment.yaml (100%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/diagrams-tools}/mermaid/kustomize/mermaid-ingress.yaml (100%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/diagrams-tools}/mermaid/kustomize/mermaid-service.yaml (100%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/diagrams-tools}/plantuml/argocd-apps-plantuml-app.yaml (92%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/diagrams-tools}/plantuml/argocd-apps-plantuml-network-policy.yaml (93%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/diagrams-tools}/plantuml/values-ovveride.yaml (100%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/monitoring}/karma/argocd-apps-karma-app.yaml (92%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/monitoring}/karma/argocd-apps-karma-network-policy.yaml (93%) rename clusters/k8s-avroid-office.prod.local/namespaces/{prod => avroid-prod/monitoring}/karma/values-ovveride.yaml (100%) diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/argocd-apps-prod.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/argocd-apps-avroid-prod.yaml similarity index 88% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/argocd-apps-prod.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/argocd-apps-avroid-prod.yaml index f801160..6f8473a 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/prod/argocd-apps-prod.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/argocd-apps-avroid-prod.yaml @@ -2,9 +2,9 @@ apiVersion: v1 kind: Namespace metadata: - name: prod + name: avroid-prod labels: - name: prod + name: avroid-prod app.kubernetes.io/managed-by: argocd annotations: argocd.argoproj.io/sync-wave: "-1" @@ -13,8 +13,8 @@ metadata: apiVersion: v1 kind: ResourceQuota metadata: - name: prod - namespace: prod + name: avroid-prod + namespace: avroid-prod labels: app.kubernetes.io/managed-by: argocd spec: @@ -34,8 +34,8 @@ spec: apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: - name: prod-common - namespace: prod + name: avroid-prod-common + namespace: avroid-prod labels: app.kubernetes.io/managed-by: argocd spec: diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/argocd-apps-mermaid-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/argocd-apps-mermaid-app.yaml similarity index 87% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/argocd-apps-mermaid-app.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/argocd-apps-mermaid-app.yaml index 4a52aff..fdd3f0d 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/argocd-apps-mermaid-app.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/argocd-apps-mermaid-app.yaml @@ -10,11 +10,11 @@ spec: project: mermaid destination: server: https://kubernetes.default.svc - namespace: prod + namespace: avroid-prod sources: - repoURL: https://git.avroid.tech/K8s/k8s-configs.git targetRevision: master - path: clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/kustomize + path: clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/kustomize syncPolicy: automated: prune: true @@ -36,7 +36,7 @@ spec: - https://git.avroid.tech/K8s/k8s-configs.git # Only permit applications to deploy to the guestbook namespace in the same cluster destinations: - - namespace: prod + - namespace: avroid-prod server: https://kubernetes.default.svc # Deny all cluster-scoped resources from being created, except for Namespace clusterResourceWhitelist: diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/argocd-apps-plantuml-network-policy.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/argocd-apps-plantuml-network-policy.yaml similarity index 93% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/argocd-apps-plantuml-network-policy.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/argocd-apps-plantuml-network-policy.yaml index 27dd688..140a3d8 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/argocd-apps-plantuml-network-policy.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/argocd-apps-plantuml-network-policy.yaml @@ -3,7 +3,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: name: mermaid-in - namespace: prod + namespace: avroid-prod labels: app.kubernetes.io/managed-by: argocd spec: diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/kustomize/kustomization.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/kustomize/kustomization.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/kustomize/kustomization.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/kustomize/kustomization.yaml diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/kustomize/mermaid-deployment.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/kustomize/mermaid-deployment.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/kustomize/mermaid-deployment.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/kustomize/mermaid-deployment.yaml diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/kustomize/mermaid-ingress.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/kustomize/mermaid-ingress.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/kustomize/mermaid-ingress.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/kustomize/mermaid-ingress.yaml diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/kustomize/mermaid-service.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/kustomize/mermaid-service.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/mermaid/kustomize/mermaid-service.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/mermaid/kustomize/mermaid-service.yaml diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/plantuml/argocd-apps-plantuml-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/plantuml/argocd-apps-plantuml-app.yaml similarity index 92% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/plantuml/argocd-apps-plantuml-app.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/plantuml/argocd-apps-plantuml-app.yaml index ee73274..513bb78 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/prod/plantuml/argocd-apps-plantuml-app.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/plantuml/argocd-apps-plantuml-app.yaml @@ -10,7 +10,7 @@ spec: project: plantuml destination: server: https://kubernetes.default.svc - namespace: prod + namespace: avroid-prod sources: - repoURL: https://git.avroid.tech/K8s/k8s-configs.git targetRevision: master @@ -20,7 +20,7 @@ spec: targetRevision: 3.36.0 helm: valueFiles: - - $values/clusters/k8s-avroid-office.prod.local/namespaces/prod/plantuml/values-ovveride.yaml + - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/plantuml/values-ovveride.yaml syncPolicy: automated: prune: true @@ -43,7 +43,7 @@ spec: - https://nexus.avroid.tech/repository/devops-helm-proxy-helm/ # Only permit applications to deploy to the guestbook namespace in the same cluster destinations: - - namespace: prod + - namespace: avroid-prod server: https://kubernetes.default.svc # Deny all cluster-scoped resources from being created, except for Namespace clusterResourceWhitelist: diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/plantuml/argocd-apps-plantuml-network-policy.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/plantuml/argocd-apps-plantuml-network-policy.yaml similarity index 93% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/plantuml/argocd-apps-plantuml-network-policy.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/plantuml/argocd-apps-plantuml-network-policy.yaml index 349c059..a9099b3 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/prod/plantuml/argocd-apps-plantuml-network-policy.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/plantuml/argocd-apps-plantuml-network-policy.yaml @@ -3,7 +3,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: name: plantuml-in - namespace: prod + namespace: avroid-prod labels: app.kubernetes.io/managed-by: argocd spec: diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/plantuml/values-ovveride.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/plantuml/values-ovveride.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/plantuml/values-ovveride.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/diagrams-tools/plantuml/values-ovveride.yaml diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/karma/argocd-apps-karma-app.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-app.yaml similarity index 92% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/karma/argocd-apps-karma-app.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-app.yaml index c303bd9..39bf995 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/prod/karma/argocd-apps-karma-app.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-app.yaml @@ -10,7 +10,7 @@ spec: project: karma destination: server: https://kubernetes.default.svc - namespace: prod + namespace: avroid-prod sources: - repoURL: https://git.avroid.tech/K8s/k8s-configs.git targetRevision: master @@ -20,7 +20,7 @@ spec: targetRevision: 2.9.3 helm: valueFiles: - - $values/clusters/k8s-avroid-office.prod.local/namespaces/prod/karma/values-ovveride.yaml + - $values/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/values-ovveride.yaml syncPolicy: automated: prune: true @@ -43,7 +43,7 @@ spec: - https://nexus.avroid.tech/repository/devops-helm-proxy-helm/ # Only permit applications to deploy to the guestbook namespace in the same cluster destinations: - - namespace: prod + - namespace: avroid-prod server: https://kubernetes.default.svc # Deny all cluster-scoped resources from being created, except for Namespace clusterResourceWhitelist: diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/karma/argocd-apps-karma-network-policy.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-network-policy.yaml similarity index 93% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/karma/argocd-apps-karma-network-policy.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-network-policy.yaml index 186e545..9c7e73d 100644 --- a/clusters/k8s-avroid-office.prod.local/namespaces/prod/karma/argocd-apps-karma-network-policy.yaml +++ b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/argocd-apps-karma-network-policy.yaml @@ -3,7 +3,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: name: karma-in - namespace: prod + namespace: avroid-prod labels: app.kubernetes.io/managed-by: argocd spec: @@ -22,7 +22,7 @@ apiVersion: networking.k8s.io/v1 kind: NetworkPolicy metadata: name: karma-out - namespace: prod + namespace: avroid-prod labels: app.kubernetes.io/managed-by: argocd spec: diff --git a/clusters/k8s-avroid-office.prod.local/namespaces/prod/karma/values-ovveride.yaml b/clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/values-ovveride.yaml similarity index 100% rename from clusters/k8s-avroid-office.prod.local/namespaces/prod/karma/values-ovveride.yaml rename to clusters/k8s-avroid-office.prod.local/namespaces/avroid-prod/monitoring/karma/values-ovveride.yaml