From 0b6e614f16cd9a2d075afa0d5372cbd6683372d9 Mon Sep 17 00:00:00 2001
From: Hamza Remmal <hamzaremmalpriv@gmail.com>
Date: Tue, 5 Sep 2023 14:20:27 +0100
Subject: [PATCH] Group all the components of the cluster in the k8s/components
folder
---
.../logging/fluent-bit/autogenerated.yaml | 0
.../logging/fluent-bit/fluent-bit-0.36.0.tgz | Bin
.../logging/fluent-bit/kustomization.yaml | 0
k8s/{ => components}/logging/fluent-bit/values.yaml | 0
k8s/{ => components}/logging/kustomization.yaml | 0
k8s/{ => components}/logging/openobserve.yaml | 0
k8s/{ => components}/moodle/db.yaml | 0
k8s/{ => components}/moodle/kustomization.yaml | 0
k8s/{ => components}/moodle/moodle.yaml | 0
.../spring-app/allow-ingress-network-policy.yaml | 0
.../spring-app/grading-service.yaml | 0
.../spring-app/job-manager-service-account.yaml | 0
k8s/{ => components}/spring-app/kustomization.yaml | 0
k8s/{ => components}/traefik/autogenerated.yaml | 0
k8s/{ => components}/traefik/kustomization.yaml | 0
k8s/{ => components}/traefik/traefik-23.1.0.tgz | Bin
k8s/{ => components}/traefik/values.yaml | 0
k8s/deploy-envs/ci/kustomization.yaml | 4 ++--
k8s/deploy-envs/cluster/logging/kustomization.yaml | 2 +-
k8s/deploy-envs/cluster/prod/kustomization.yaml | 2 +-
.../cluster/staging-autograde/kustomization.yaml | 4 ++--
.../cluster/staging-epfl/kustomization.yaml | 2 +-
k8s/deploy-envs/cluster/traefik/kustomization.yaml | 2 +-
k8s/deploy-envs/local/kustomization.yaml | 4 ++--
24 files changed, 10 insertions(+), 10 deletions(-)
rename k8s/{ => components}/logging/fluent-bit/autogenerated.yaml (100%)
rename k8s/{ => components}/logging/fluent-bit/fluent-bit-0.36.0.tgz (100%)
rename k8s/{ => components}/logging/fluent-bit/kustomization.yaml (100%)
rename k8s/{ => components}/logging/fluent-bit/values.yaml (100%)
rename k8s/{ => components}/logging/kustomization.yaml (100%)
rename k8s/{ => components}/logging/openobserve.yaml (100%)
rename k8s/{ => components}/moodle/db.yaml (100%)
rename k8s/{ => components}/moodle/kustomization.yaml (100%)
rename k8s/{ => components}/moodle/moodle.yaml (100%)
rename k8s/{ => components}/spring-app/allow-ingress-network-policy.yaml (100%)
rename k8s/{ => components}/spring-app/grading-service.yaml (100%)
rename k8s/{ => components}/spring-app/job-manager-service-account.yaml (100%)
rename k8s/{ => components}/spring-app/kustomization.yaml (100%)
rename k8s/{ => components}/traefik/autogenerated.yaml (100%)
rename k8s/{ => components}/traefik/kustomization.yaml (100%)
rename k8s/{ => components}/traefik/traefik-23.1.0.tgz (100%)
rename k8s/{ => components}/traefik/values.yaml (100%)
diff --git a/k8s/logging/fluent-bit/autogenerated.yaml b/k8s/components/logging/fluent-bit/autogenerated.yaml
similarity index 100%
rename from k8s/logging/fluent-bit/autogenerated.yaml
rename to k8s/components/logging/fluent-bit/autogenerated.yaml
diff --git a/k8s/logging/fluent-bit/fluent-bit-0.36.0.tgz b/k8s/components/logging/fluent-bit/fluent-bit-0.36.0.tgz
similarity index 100%
rename from k8s/logging/fluent-bit/fluent-bit-0.36.0.tgz
rename to k8s/components/logging/fluent-bit/fluent-bit-0.36.0.tgz
diff --git a/k8s/logging/fluent-bit/kustomization.yaml b/k8s/components/logging/fluent-bit/kustomization.yaml
similarity index 100%
rename from k8s/logging/fluent-bit/kustomization.yaml
rename to k8s/components/logging/fluent-bit/kustomization.yaml
diff --git a/k8s/logging/fluent-bit/values.yaml b/k8s/components/logging/fluent-bit/values.yaml
similarity index 100%
rename from k8s/logging/fluent-bit/values.yaml
rename to k8s/components/logging/fluent-bit/values.yaml
diff --git a/k8s/logging/kustomization.yaml b/k8s/components/logging/kustomization.yaml
similarity index 100%
rename from k8s/logging/kustomization.yaml
rename to k8s/components/logging/kustomization.yaml
diff --git a/k8s/logging/openobserve.yaml b/k8s/components/logging/openobserve.yaml
similarity index 100%
rename from k8s/logging/openobserve.yaml
rename to k8s/components/logging/openobserve.yaml
diff --git a/k8s/moodle/db.yaml b/k8s/components/moodle/db.yaml
similarity index 100%
rename from k8s/moodle/db.yaml
rename to k8s/components/moodle/db.yaml
diff --git a/k8s/moodle/kustomization.yaml b/k8s/components/moodle/kustomization.yaml
similarity index 100%
rename from k8s/moodle/kustomization.yaml
rename to k8s/components/moodle/kustomization.yaml
diff --git a/k8s/moodle/moodle.yaml b/k8s/components/moodle/moodle.yaml
similarity index 100%
rename from k8s/moodle/moodle.yaml
rename to k8s/components/moodle/moodle.yaml
diff --git a/k8s/spring-app/allow-ingress-network-policy.yaml b/k8s/components/spring-app/allow-ingress-network-policy.yaml
similarity index 100%
rename from k8s/spring-app/allow-ingress-network-policy.yaml
rename to k8s/components/spring-app/allow-ingress-network-policy.yaml
diff --git a/k8s/spring-app/grading-service.yaml b/k8s/components/spring-app/grading-service.yaml
similarity index 100%
rename from k8s/spring-app/grading-service.yaml
rename to k8s/components/spring-app/grading-service.yaml
diff --git a/k8s/spring-app/job-manager-service-account.yaml b/k8s/components/spring-app/job-manager-service-account.yaml
similarity index 100%
rename from k8s/spring-app/job-manager-service-account.yaml
rename to k8s/components/spring-app/job-manager-service-account.yaml
diff --git a/k8s/spring-app/kustomization.yaml b/k8s/components/spring-app/kustomization.yaml
similarity index 100%
rename from k8s/spring-app/kustomization.yaml
rename to k8s/components/spring-app/kustomization.yaml
diff --git a/k8s/traefik/autogenerated.yaml b/k8s/components/traefik/autogenerated.yaml
similarity index 100%
rename from k8s/traefik/autogenerated.yaml
rename to k8s/components/traefik/autogenerated.yaml
diff --git a/k8s/traefik/kustomization.yaml b/k8s/components/traefik/kustomization.yaml
similarity index 100%
rename from k8s/traefik/kustomization.yaml
rename to k8s/components/traefik/kustomization.yaml
diff --git a/k8s/traefik/traefik-23.1.0.tgz b/k8s/components/traefik/traefik-23.1.0.tgz
similarity index 100%
rename from k8s/traefik/traefik-23.1.0.tgz
rename to k8s/components/traefik/traefik-23.1.0.tgz
diff --git a/k8s/traefik/values.yaml b/k8s/components/traefik/values.yaml
similarity index 100%
rename from k8s/traefik/values.yaml
rename to k8s/components/traefik/values.yaml
diff --git a/k8s/deploy-envs/ci/kustomization.yaml b/k8s/deploy-envs/ci/kustomization.yaml
index 6ff0a7a5..bba19f33 100644
--- a/k8s/deploy-envs/ci/kustomization.yaml
+++ b/k8s/deploy-envs/ci/kustomization.yaml
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- - ../../spring-app
- - ../../moodle
+ - ../../components/spring-app
+ - ../../components/moodle
- persistent-volumes.yaml
# HR : Configure the right images to use in the ci
diff --git a/k8s/deploy-envs/cluster/logging/kustomization.yaml b/k8s/deploy-envs/cluster/logging/kustomization.yaml
index d2fb7ed5..1c108c95 100644
--- a/k8s/deploy-envs/cluster/logging/kustomization.yaml
+++ b/k8s/deploy-envs/cluster/logging/kustomization.yaml
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: logging
resources:
- - ../../../logging
+ - ../../../components/logging
patches:
# Patch openobserve StatefulSet's volumeClaimTemplates to use class nfs-client and size 10Gi
- target:
diff --git a/k8s/deploy-envs/cluster/prod/kustomization.yaml b/k8s/deploy-envs/cluster/prod/kustomization.yaml
index b8a5e950..43b1b8fd 100644
--- a/k8s/deploy-envs/cluster/prod/kustomization.yaml
+++ b/k8s/deploy-envs/cluster/prod/kustomization.yaml
@@ -6,7 +6,7 @@ namespace: prod
resources:
- ingress.yaml
# HR : Only deploy the autograde service to the production
- - ../../../spring-app
+ - ../../../components/spring-app
# HR : Configure the right images to use in production
images:
diff --git a/k8s/deploy-envs/cluster/staging-autograde/kustomization.yaml b/k8s/deploy-envs/cluster/staging-autograde/kustomization.yaml
index bb25b6f3..f9f865a3 100644
--- a/k8s/deploy-envs/cluster/staging-autograde/kustomization.yaml
+++ b/k8s/deploy-envs/cluster/staging-autograde/kustomization.yaml
@@ -6,8 +6,8 @@ namespace: staging-autograde
resources:
- ingress.yaml
# HR : Only deploy the autograde service and Moodle to the staging-autograde
- - ../../../spring-app
- - ../../../moodle
+ - ../../../components/spring-app
+ - ../../../components/moodle
# HR : Configure the right images to use in staging-autograde
images:
diff --git a/k8s/deploy-envs/cluster/staging-epfl/kustomization.yaml b/k8s/deploy-envs/cluster/staging-epfl/kustomization.yaml
index be6873b5..48941aa3 100644
--- a/k8s/deploy-envs/cluster/staging-epfl/kustomization.yaml
+++ b/k8s/deploy-envs/cluster/staging-epfl/kustomization.yaml
@@ -6,7 +6,7 @@ namespace: staging-epfl
resources:
- ingress.yaml
# HR : Only deploy the autograde service for the staging-epfl
- - ../../../spring-app
+ - ../../../components/spring-app
# HR : Configure the right images to use in staging-epfl
images:
diff --git a/k8s/deploy-envs/cluster/traefik/kustomization.yaml b/k8s/deploy-envs/cluster/traefik/kustomization.yaml
index 14e9a37f..ad0e3fa6 100644
--- a/k8s/deploy-envs/cluster/traefik/kustomization.yaml
+++ b/k8s/deploy-envs/cluster/traefik/kustomization.yaml
@@ -4,7 +4,7 @@ kind: Kustomization
namespace: traefik
resources:
- - ../../../traefik
+ - ../../../components/traefik
secretGenerator:
# Provides username and password for basic auth middleware
diff --git a/k8s/deploy-envs/local/kustomization.yaml b/k8s/deploy-envs/local/kustomization.yaml
index f0879983..790fb8b3 100644
--- a/k8s/deploy-envs/local/kustomization.yaml
+++ b/k8s/deploy-envs/local/kustomization.yaml
@@ -2,8 +2,8 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- - ../../spring-app
- - ../../moodle
+ - ../../components/spring-app
+ - ../../components/moodle
- db-lb-service.yaml
#- ingress.yaml
- persistent-volumes.yaml
--
GitLab