diff --git a/apps/auth-api/overlays/demo/kustomization.yaml b/apps/auth-api/overlays/demo/kustomization.yaml deleted file mode 100644 index f85a7cb..0000000 --- a/apps/auth-api/overlays/demo/kustomization.yaml +++ /dev/null @@ -1,51 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -# Active managed dev overlay for the shared EKS registration. Values below are -# environment-owned; CI publishes one immutable image and GitOps promotes its -# digest unchanged through every managed environment. -namespace: microtodo-demo - -resources: -- ../../topology - -replicas: -- count: 1 - name: auth-api - - # Only the on/off switch and target for tracing (otel.go - # in the auth-api repo); the OpenTelemetry SDK reads this - # standard env var itself, no code-level endpoint literal. -patches: -- patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: - name: auth-api - spec: - template: - spec: - containers: - - name: auth-api - env: - # Only the on/off switch and target for tracing (otel.go - # in the auth-api repo); the OpenTelemetry SDK reads this - # standard env var itself, no code-level endpoint literal. - - name: OTEL_EXPORTER_OTLP_ENDPOINT - value: http://jaeger-collector.observability.svc:4317 - resources: - requests: - cpu: 50m - memory: 64Mi - limits: - cpu: 250m - memory: 256Mi - target: - kind: Deployment - name: auth-api - -# The neutral ECR repository is shared across managed environments. -images: -- digest: sha256:9161a9d737eaee4af013fac39c598583c5ea71786643e2c4658c6281db74425d - name: auth-api - newName: 916491575487.dkr.ecr.us-east-1.amazonaws.com/microtodosuite/auth-api diff --git a/apps/frontend/overlays/demo/kustomization.yaml b/apps/frontend/overlays/demo/kustomization.yaml deleted file mode 100644 index 702903c..0000000 --- a/apps/frontend/overlays/demo/kustomization.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: microtodo-demo -resources: [../../topology] -replicas: [{name: frontend, count: 1}] -patches: - - target: {kind: Deployment, name: frontend} - patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: {name: frontend} - spec: - template: - spec: - containers: - - name: frontend - resources: - requests: {cpu: 25m, memory: 32Mi} - limits: {cpu: 100m, memory: 128Mi} -images: - - name: frontend - newName: 916491575487.dkr.ecr.us-east-1.amazonaws.com/microtodosuite/frontend - digest: sha256:5fe218db17bb8d71d00458c44d8a88e9d7c9875f7e5a4cfee980eef45de0e728 diff --git a/apps/log-message-processor/overlays/demo/kustomization.yaml b/apps/log-message-processor/overlays/demo/kustomization.yaml deleted file mode 100644 index 824d1f8..0000000 --- a/apps/log-message-processor/overlays/demo/kustomization.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: microtodo-demo -resources: [../../topology] -replicas: [{name: log-message-processor, count: 1}] -patches: - - target: {kind: ConfigMap, name: log-message-processor-config} - patch: |- - apiVersion: v1 - kind: ConfigMap - metadata: {name: log-message-processor-config} - data: - REDIS_HOST: redis - - target: {kind: Deployment, name: log-message-processor} - patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: {name: log-message-processor} - spec: - template: - metadata: - annotations: - runtime-config.microtodosuite.io/revision: namespace-local-redis-v1 - spec: - containers: - - name: log-message-processor - resources: - requests: {cpu: 50m, memory: 64Mi} - limits: {cpu: 250m, memory: 256Mi} -images: - - name: log-message-processor - newName: 916491575487.dkr.ecr.us-east-1.amazonaws.com/microtodosuite/log-message-processor - digest: sha256:17c5848722fe9bc5a7daf618418008e39ea8077a75dca0ed1c7e5a755bcdfc51 diff --git a/apps/todos-api/overlays/demo/kustomization.yaml b/apps/todos-api/overlays/demo/kustomization.yaml deleted file mode 100644 index f8f7ef1..0000000 --- a/apps/todos-api/overlays/demo/kustomization.yaml +++ /dev/null @@ -1,33 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -namespace: microtodo-demo -resources: [../../topology] -replicas: [{name: todos-api, count: 1}] -patches: - - target: {kind: ConfigMap, name: todos-api-config} - patch: |- - apiVersion: v1 - kind: ConfigMap - metadata: {name: todos-api-config} - data: - REDIS_HOST: redis - - target: {kind: Deployment, name: todos-api} - patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: {name: todos-api} - spec: - template: - metadata: - annotations: - runtime-config.microtodosuite.io/revision: namespace-local-redis-v1 - spec: - containers: - - name: todos-api - resources: - requests: {cpu: 50m, memory: 64Mi} - limits: {cpu: 250m, memory: 256Mi} -images: - - name: todos-api - newName: 916491575487.dkr.ecr.us-east-1.amazonaws.com/microtodosuite/todos-api - digest: sha256:3ff827efe849fe812151c221c3d4c418d7490384e2bcb5c1bb9975fd3f2a4185 diff --git a/apps/users-api/overlays/demo/kustomization.yaml b/apps/users-api/overlays/demo/kustomization.yaml deleted file mode 100644 index 903985f..0000000 --- a/apps/users-api/overlays/demo/kustomization.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: microtodo-demo -resources: [../../topology] -replicas: - - name: users-api - count: 1 -patches: - - target: {kind: Deployment, name: users-api} - patch: |- - apiVersion: apps/v1 - kind: Deployment - metadata: {name: users-api} - spec: - template: - spec: - containers: - - name: users-api - resources: - requests: {cpu: 150m, memory: 256Mi} - limits: {cpu: 500m, memory: 512Mi} -images: - - name: users-api - newName: 916491575487.dkr.ecr.us-east-1.amazonaws.com/microtodosuite/users-api - digest: sha256:48936907d0b4fb68bd2f0644f8246517c9c9ad8c61e874c8ce3a31b89f11d845 diff --git a/clusters/eks-dev/activation-apps.yaml b/clusters/eks-dev/activation-apps.yaml index 63514e6..6994b20 100644 --- a/clusters/eks-dev/activation-apps.yaml +++ b/clusters/eks-dev/activation-apps.yaml @@ -9,5 +9,3 @@ server: https://kubernetes.default.svc - env: prod server: https://kubernetes.default.svc - - env: demo - server: https://kubernetes.default.svc diff --git a/clusters/eks-dev/activation-environments.yaml b/clusters/eks-dev/activation-environments.yaml index 42f9be1..9b45ed1 100644 --- a/clusters/eks-dev/activation-environments.yaml +++ b/clusters/eks-dev/activation-environments.yaml @@ -8,5 +8,3 @@ server: https://kubernetes.default.svc - env: prod server: https://kubernetes.default.svc - - env: demo - server: https://kubernetes.default.svc diff --git a/clusters/eks-dev/rolling-sync-apps.yaml b/clusters/eks-dev/rolling-sync-apps.yaml index c710617..19b0f07 100644 --- a/clusters/eks-dev/rolling-sync-apps.yaml +++ b/clusters/eks-dev/rolling-sync-apps.yaml @@ -28,8 +28,3 @@ operator: In values: ["prod"] maxUpdate: 1 - - matchExpressions: - - key: microtodosuite.io/environment - operator: In - values: ["demo"] - maxUpdate: 1 diff --git a/environments/demo/kustomization.yaml b/environments/demo/kustomization.yaml deleted file mode 100644 index c79a5e1..0000000 --- a/environments/demo/kustomization.yaml +++ /dev/null @@ -1,39 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: microtodo-demo - -resources: - - ../base - - namespace.yaml - - resourcequota.yaml - - rolebinding.yaml - - networkpolicy-allow-required-egress.yaml - -patches: - - target: - version: v1 - kind: ServiceAccount - name: external-secrets-jwt - patch: |- - apiVersion: v1 - kind: ServiceAccount - metadata: - name: external-secrets-jwt - annotations: - eks.amazonaws.com/role-arn: arn:aws:iam::916491575487:role/microtodosuite-demo-jwt-reader - - target: - group: external-secrets.io - version: v1 - kind: ExternalSecret - name: auth-api-secrets - patch: |- - apiVersion: external-secrets.io/v1 - kind: ExternalSecret - metadata: - name: auth-api-secrets - spec: - data: - - secretKey: JWT_SECRET - remoteRef: - key: microtodosuite/demo/auth-api-secrets diff --git a/environments/demo/namespace.yaml b/environments/demo/namespace.yaml deleted file mode 100644 index 9f8b3be..0000000 --- a/environments/demo/namespace.yaml +++ /dev/null @@ -1,9 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: microtodo-demo - labels: - microtodosuite.io/environment: demo - microtodosuite.io/managed-by: argocd - annotations: - argocd.argoproj.io/sync-wave: "-2" diff --git a/environments/demo/networkpolicy-allow-required-egress.yaml b/environments/demo/networkpolicy-allow-required-egress.yaml deleted file mode 100644 index 9847b0c..0000000 --- a/environments/demo/networkpolicy-allow-required-egress.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: allow-business-clients-to-environment-redis -spec: - podSelector: - matchExpressions: - - key: app.kubernetes.io/name - operator: In - values: - - todos-api - - log-message-processor - policyTypes: - - Egress - egress: - - to: - - podSelector: - matchLabels: - app.kubernetes.io/name: redis - ports: - - protocol: TCP - port: 6379 diff --git a/environments/demo/resourcequota.yaml b/environments/demo/resourcequota.yaml deleted file mode 100644 index 83ad33d..0000000 --- a/environments/demo/resourcequota.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: v1 -kind: ResourceQuota -metadata: - name: environment-budget - annotations: - argocd.argoproj.io/sync-wave: "-1" -spec: - hard: - requests.cpu: 550m - limits.cpu: 2300m - requests.memory: 896Mi - limits.memory: 2304Mi - pods: "12" diff --git a/environments/demo/rolebinding.yaml b/environments/demo/rolebinding.yaml deleted file mode 100644 index a131830..0000000 --- a/environments/demo/rolebinding.yaml +++ /dev/null @@ -1,14 +0,0 @@ -apiVersion: rbac.authorization.k8s.io/v1 -kind: RoleBinding -metadata: - name: environment-workload-maintainers - annotations: - argocd.argoproj.io/sync-wave: "-1" -subjects: - - apiGroup: rbac.authorization.k8s.io - kind: Group - name: microtodosuite:demo-maintainers -roleRef: - apiGroup: rbac.authorization.k8s.io - kind: Role - name: environment-workload-maintainer