diff --git a/practice/7.oneshot-tasks/1.job/README.md b/practice/10.oneshot-tasks/1.job/README.md similarity index 80% rename from practice/7.oneshot-tasks/1.job/README.md rename to practice/10.oneshot-tasks/1.job/README.md index 3069102..adb7927 100644 --- a/practice/7.oneshot-tasks/1.job/README.md +++ b/practice/10.oneshot-tasks/1.job/README.md @@ -5,7 +5,6 @@ 1) Создаем job ```bash -cd ~/slurm/practice/7.oneshot-tasks/1.job kubectl apply -f job.yaml ``` @@ -22,13 +21,13 @@ NAME COMPLETIONS DURATION AGE hello 1/1 2s 88s ``` -3) Смотрим на поды +3) Смотрим на Pod'ы ```bash kubectl get pod ``` -Видим под, созданный джобой: +Видим Pod, созданный Job'ой: ```bash NAME READY STATUS RESTARTS AGE @@ -48,7 +47,7 @@ Mon Mar 18 15:06:10 UTC 2019 Hello from the Kubernetes cluster ``` -5) Удаляем джоб +5) Удаляем Job ```bash kubectl delete job hello @@ -56,7 +55,7 @@ kubectl delete job hello ### Проверяем работу параметра backoffLimit -6) Открываем файл job.yaml и находим командy выполняющуюся в поде +6) Открываем файл job.yaml и находим командy выполняющуюся в Pod: ```yaml args: @@ -74,7 +73,7 @@ args: - date; echo Hello from the Kubernetes cluster; exit 1 ``` -7) Создаем джоб +7) Создаем Job: ```bash kubectl apply -f job.yaml @@ -93,13 +92,13 @@ NAME COMPLETIONS DURATION AGE hello 0/1 27s 27s ``` -9) Смотрим на поды +9) Смотрим на Pod'ы ```bash kubectl get pod ``` -Видим поды, созданные джобой: +Видим Pod'ы, созданные Job'ой: ```bash NAME READY STATUS RESTARTS AGE @@ -110,7 +109,7 @@ hello-rl984 0/1 Error 0 22m Они в статусе Error -10) Смотрим в описание джобы +10) Смотрим в описание Job'ы ```bash kubectl describe job hello @@ -122,7 +121,7 @@ kubectl describe job hello Warning BackoffLimitExceeded 23m job-controller Job has reached the specified backoff limit ``` -11) Удаляем джоб +11) Удаляем Job ```bash kubectl delete job hello @@ -130,7 +129,7 @@ kubectl delete job hello ### Проверяем работу параметра activeDeadlineSeconds -12) Открываем файл job.yaml и находим командy, выполняющуюся в поде +12) Открываем файл job.yaml и находим командy, выполняющуюся в Pod'е: ```yaml args: @@ -148,7 +147,7 @@ args: - while true; do date; echo Hello from the Kubernetes cluster; sleep 1; done ``` -13) Создаем джоб +13) Создаем Job ```bash kubectl apply -f job.yaml @@ -167,20 +166,20 @@ NAME COMPLETIONS DURATION AGE hello 0/1 27s 27s ``` -15) Смотрим на поды +15) Смотрим на Pod'ы ```bash kubectl get pod ``` -Видим поды, созданный джобой +Видим Pod'ы, созданный Job'ой ```bash NAME READY STATUS RESTARTS AGE hello-bt6g6 1/1 Running 0 5s ``` -16) Ждем 60 секунд и проверяем джоб +16) Ждем 60 секунд и проверяем Job ```bash kubectl describe job hello @@ -191,7 +190,7 @@ kubectl describe job hello Warning DeadlineExceeded 2m17s job-controller Job was active longer than specified deadline ``` -17) Удаляем джоб +17) Удаляем Job ```bash kubectl delete job hello diff --git a/practice/7.oneshot-tasks/1.job/job.yaml b/practice/10.oneshot-tasks/1.job/job.yaml similarity index 100% rename from practice/7.oneshot-tasks/1.job/job.yaml rename to practice/10.oneshot-tasks/1.job/job.yaml diff --git a/practice/7.oneshot-tasks/2.cronjob/README.md b/practice/10.oneshot-tasks/2.cronjob/README.md similarity index 69% rename from practice/7.oneshot-tasks/2.cronjob/README.md rename to practice/10.oneshot-tasks/2.cronjob/README.md index 278d6db..066450c 100644 --- a/practice/7.oneshot-tasks/2.cronjob/README.md +++ b/practice/10.oneshot-tasks/2.cronjob/README.md @@ -1,9 +1,8 @@ # CronJob -1) Создаем крон джоб +1) Создаем CronJob: ```bash -cd ~/slurm/practice/7.oneshot-tasks/2.cronjob kubectl apply -f cronjob.yaml ``` @@ -20,39 +19,39 @@ NAME SCHEDULE SUSPEND ACTIVE LAST SCHEDULE AGE hello */1 * * * * False 0 14s ``` -3) Через минуту пробуем посмотреть на джобы +3) Через минуту пробуем посмотреть на Job'ы ```bash kubectl get job ``` -Видим созданный джоб +Видим созданный Job ```bash NAME COMPLETIONS DURATION AGE hello-1552924260 1/1 2s 49s ``` -4) Смотрим на поды +4) Смотрим на Pod'ы ```bash kubectl get pod ``` -Видим под +Видим Pod ```bash NAME READY STATUS RESTARTS AGE hello-1552924260-gp7pk 0/1 Completed 0 80s ``` -5) Если мы подождем 5-10 минут, то увидим что старые джобы и поды удаляются по мере появления новых +5) Если мы подождем 5-10 минут, то увидим что старые Job'ы и Pod'ы удаляются по мере появления новых ```bash kubectl get job,pod ``` -6) Удаляем крон джоб +6) Удаляем CronJob ```bash kubectl delete -f cronjob.yaml diff --git a/practice/7.oneshot-tasks/2.cronjob/cronjob.yaml b/practice/10.oneshot-tasks/2.cronjob/cronjob.yaml similarity index 100% rename from practice/7.oneshot-tasks/2.cronjob/cronjob.yaml rename to practice/10.oneshot-tasks/2.cronjob/cronjob.yaml diff --git a/practice/8.deployment-alternative/1.daemonset/README.md b/practice/11.deployment-alternative/1.daemonset/README.md similarity index 100% rename from practice/8.deployment-alternative/1.daemonset/README.md rename to practice/11.deployment-alternative/1.daemonset/README.md diff --git a/practice/8.deployment-alternative/1.daemonset/daemonset.yaml b/practice/11.deployment-alternative/1.daemonset/daemonset.yaml similarity index 100% rename from practice/8.deployment-alternative/1.daemonset/daemonset.yaml rename to practice/11.deployment-alternative/1.daemonset/daemonset.yaml diff --git a/practice/8.deployment-alternative/2.statefulset/README.md b/practice/11.deployment-alternative/2.statefulset/README.md similarity index 100% rename from practice/8.deployment-alternative/2.statefulset/README.md rename to practice/11.deployment-alternative/2.statefulset/README.md diff --git a/practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/configmap.yaml b/practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/configmap.yaml similarity index 100% rename from practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/configmap.yaml rename to practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/configmap.yaml diff --git a/practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/role.yaml b/practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/role.yaml similarity index 100% rename from practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/role.yaml rename to practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/role.yaml diff --git a/practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/rolebinding.yaml b/practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/rolebinding.yaml similarity index 100% rename from practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/rolebinding.yaml rename to practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/rolebinding.yaml diff --git a/practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/service.yaml b/practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/service.yaml similarity index 100% rename from practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/service.yaml rename to practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/service.yaml diff --git a/practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/serviceaccount.yaml b/practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/serviceaccount.yaml similarity index 100% rename from practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/serviceaccount.yaml rename to practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/serviceaccount.yaml diff --git a/practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/statefulset.yaml b/practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/statefulset.yaml similarity index 100% rename from practice/8.deployment-alternative/2.statefulset/rabbitmq-statefulset/statefulset.yaml rename to practice/11.deployment-alternative/2.statefulset/rabbitmq-statefulset/statefulset.yaml diff --git a/practice/9.cluster-authorization/1.rbac/README.md b/practice/13.cluster-authorization/1.rbac/README.md similarity index 100% rename from practice/9.cluster-authorization/1.rbac/README.md rename to practice/13.cluster-authorization/1.rbac/README.md diff --git a/practice/3.saving-configurations/1.env/configmap.yaml b/practice/13.cluster-authorization/1.rbac/configmap.yaml similarity index 100% rename from practice/3.saving-configurations/1.env/configmap.yaml rename to practice/13.cluster-authorization/1.rbac/configmap.yaml diff --git a/practice/9.cluster-authorization/1.rbac/rolebinding.yaml b/practice/13.cluster-authorization/1.rbac/rolebinding.yaml similarity index 100% rename from practice/9.cluster-authorization/1.rbac/rolebinding.yaml rename to practice/13.cluster-authorization/1.rbac/rolebinding.yaml diff --git a/practice/9.cluster-authorization/1.rbac/secret.yml b/practice/13.cluster-authorization/1.rbac/secret.yml similarity index 100% rename from practice/9.cluster-authorization/1.rbac/secret.yml rename to practice/13.cluster-authorization/1.rbac/secret.yml diff --git a/practice/9.cluster-authorization/1.rbac/serviceaccount.yaml b/practice/13.cluster-authorization/1.rbac/serviceaccount.yaml similarity index 100% rename from practice/9.cluster-authorization/1.rbac/serviceaccount.yaml rename to practice/13.cluster-authorization/1.rbac/serviceaccount.yaml diff --git a/practice/10.programming-languages-in-kubernetes/README.md b/practice/14.programming-languages-in-kubernetes/README.md similarity index 100% rename from practice/10.programming-languages-in-kubernetes/README.md rename to practice/14.programming-languages-in-kubernetes/README.md diff --git a/practice/12.application-debug/.gitkeep b/practice/15.application-debug/.gitkeep similarity index 100% rename from practice/12.application-debug/.gitkeep rename to practice/15.application-debug/.gitkeep diff --git a/practice/12.application-debug/README.md b/practice/15.application-debug/README.md similarity index 100% rename from practice/12.application-debug/README.md rename to practice/15.application-debug/README.md diff --git a/practice/12.application-debug/deployment.yaml b/practice/15.application-debug/deployment.yaml similarity index 100% rename from practice/12.application-debug/deployment.yaml rename to practice/15.application-debug/deployment.yaml diff --git a/practice/13.templating/README.md b/practice/18.templating/README.md similarity index 100% rename from practice/13.templating/README.md rename to practice/18.templating/README.md diff --git a/practice/13.templating/homework/.gitkeep b/practice/18.templating/homework/.gitkeep similarity index 100% rename from practice/13.templating/homework/.gitkeep rename to practice/18.templating/homework/.gitkeep diff --git a/practice/13.templating/homework/bad_deployment.yaml b/practice/18.templating/homework/bad_deployment.yaml similarity index 100% rename from practice/13.templating/homework/bad_deployment.yaml rename to practice/18.templating/homework/bad_deployment.yaml diff --git a/practice/13.templating/homework/bad_deployment.yaml_otvet b/practice/18.templating/homework/bad_deployment.yaml_otvet similarity index 100% rename from practice/13.templating/homework/bad_deployment.yaml_otvet rename to practice/18.templating/homework/bad_deployment.yaml_otvet diff --git a/practice/13.templating/libchart/.helmignore b/practice/18.templating/libchart/.helmignore similarity index 100% rename from practice/13.templating/libchart/.helmignore rename to practice/18.templating/libchart/.helmignore diff --git a/practice/13.templating/libchart/Chart.yaml b/practice/18.templating/libchart/Chart.yaml similarity index 100% rename from practice/13.templating/libchart/Chart.yaml rename to practice/18.templating/libchart/Chart.yaml diff --git a/practice/13.templating/libchart/templates/_configmap.yaml b/practice/18.templating/libchart/templates/_configmap.yaml similarity index 100% rename from practice/13.templating/libchart/templates/_configmap.yaml rename to practice/18.templating/libchart/templates/_configmap.yaml diff --git a/practice/13.templating/libchart/templates/_util.yaml b/practice/18.templating/libchart/templates/_util.yaml similarity index 100% rename from practice/13.templating/libchart/templates/_util.yaml rename to practice/18.templating/libchart/templates/_util.yaml diff --git a/practice/13.templating/mychart/.helmignore b/practice/18.templating/mychart/.helmignore similarity index 100% rename from practice/13.templating/mychart/.helmignore rename to practice/18.templating/mychart/.helmignore diff --git a/practice/13.templating/mychart/Chart.lock b/practice/18.templating/mychart/Chart.lock similarity index 100% rename from practice/13.templating/mychart/Chart.lock rename to practice/18.templating/mychart/Chart.lock diff --git a/practice/13.templating/mychart/Chart.yaml b/practice/18.templating/mychart/Chart.yaml similarity index 100% rename from practice/13.templating/mychart/Chart.yaml rename to practice/18.templating/mychart/Chart.yaml diff --git a/practice/13.templating/mychart/templates/configmap.yaml b/practice/18.templating/mychart/templates/configmap.yaml similarity index 100% rename from practice/13.templating/mychart/templates/configmap.yaml rename to practice/18.templating/mychart/templates/configmap.yaml diff --git a/practice/13.templating/mychart/values.yaml b/practice/18.templating/mychart/values.yaml similarity index 100% rename from practice/13.templating/mychart/values.yaml rename to practice/18.templating/mychart/values.yaml diff --git a/practice/13.templating/simple-deployment.yaml b/practice/18.templating/simple-deployment.yaml similarity index 100% rename from practice/13.templating/simple-deployment.yaml rename to practice/18.templating/simple-deployment.yaml diff --git a/practice/13.templating/summary_file.yaml b/practice/18.templating/summary_file.yaml similarity index 100% rename from practice/13.templating/summary_file.yaml rename to practice/18.templating/summary_file.yaml diff --git a/practice/13.templating/wordpress/.helmignore b/practice/18.templating/wordpress/.helmignore similarity index 100% rename from practice/13.templating/wordpress/.helmignore rename to practice/18.templating/wordpress/.helmignore diff --git a/practice/13.templating/wordpress/Chart.lock b/practice/18.templating/wordpress/Chart.lock similarity index 100% rename from practice/13.templating/wordpress/Chart.lock rename to practice/18.templating/wordpress/Chart.lock diff --git a/practice/13.templating/wordpress/Chart.yaml b/practice/18.templating/wordpress/Chart.yaml similarity index 100% rename from practice/13.templating/wordpress/Chart.yaml rename to practice/18.templating/wordpress/Chart.yaml diff --git a/practice/13.templating/wordpress/README.md b/practice/18.templating/wordpress/README.md similarity index 100% rename from practice/13.templating/wordpress/README.md rename to practice/18.templating/wordpress/README.md diff --git a/practice/13.templating/wordpress/charts/common/.helmignore b/practice/18.templating/wordpress/charts/common/.helmignore similarity index 100% rename from practice/13.templating/wordpress/charts/common/.helmignore rename to practice/18.templating/wordpress/charts/common/.helmignore diff --git a/practice/13.templating/wordpress/charts/common/Chart.yaml b/practice/18.templating/wordpress/charts/common/Chart.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/common/Chart.yaml rename to practice/18.templating/wordpress/charts/common/Chart.yaml diff --git a/practice/13.templating/wordpress/charts/common/README.md b/practice/18.templating/wordpress/charts/common/README.md similarity index 100% rename from practice/13.templating/wordpress/charts/common/README.md rename to practice/18.templating/wordpress/charts/common/README.md diff --git a/practice/13.templating/wordpress/charts/common/templates/_affinities.tpl b/practice/18.templating/wordpress/charts/common/templates/_affinities.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_affinities.tpl rename to practice/18.templating/wordpress/charts/common/templates/_affinities.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_capabilities.tpl b/practice/18.templating/wordpress/charts/common/templates/_capabilities.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_capabilities.tpl rename to practice/18.templating/wordpress/charts/common/templates/_capabilities.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_errors.tpl b/practice/18.templating/wordpress/charts/common/templates/_errors.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_errors.tpl rename to practice/18.templating/wordpress/charts/common/templates/_errors.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_images.tpl b/practice/18.templating/wordpress/charts/common/templates/_images.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_images.tpl rename to practice/18.templating/wordpress/charts/common/templates/_images.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_ingress.tpl b/practice/18.templating/wordpress/charts/common/templates/_ingress.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_ingress.tpl rename to practice/18.templating/wordpress/charts/common/templates/_ingress.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_labels.tpl b/practice/18.templating/wordpress/charts/common/templates/_labels.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_labels.tpl rename to practice/18.templating/wordpress/charts/common/templates/_labels.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_names.tpl b/practice/18.templating/wordpress/charts/common/templates/_names.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_names.tpl rename to practice/18.templating/wordpress/charts/common/templates/_names.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_secrets.tpl b/practice/18.templating/wordpress/charts/common/templates/_secrets.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_secrets.tpl rename to practice/18.templating/wordpress/charts/common/templates/_secrets.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_storage.tpl b/practice/18.templating/wordpress/charts/common/templates/_storage.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_storage.tpl rename to practice/18.templating/wordpress/charts/common/templates/_storage.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_tplvalues.tpl b/practice/18.templating/wordpress/charts/common/templates/_tplvalues.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_tplvalues.tpl rename to practice/18.templating/wordpress/charts/common/templates/_tplvalues.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_utils.tpl b/practice/18.templating/wordpress/charts/common/templates/_utils.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_utils.tpl rename to practice/18.templating/wordpress/charts/common/templates/_utils.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/_warnings.tpl b/practice/18.templating/wordpress/charts/common/templates/_warnings.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/_warnings.tpl rename to practice/18.templating/wordpress/charts/common/templates/_warnings.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/validations/_cassandra.tpl b/practice/18.templating/wordpress/charts/common/templates/validations/_cassandra.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/validations/_cassandra.tpl rename to practice/18.templating/wordpress/charts/common/templates/validations/_cassandra.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/validations/_mariadb.tpl b/practice/18.templating/wordpress/charts/common/templates/validations/_mariadb.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/validations/_mariadb.tpl rename to practice/18.templating/wordpress/charts/common/templates/validations/_mariadb.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/validations/_mongodb.tpl b/practice/18.templating/wordpress/charts/common/templates/validations/_mongodb.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/validations/_mongodb.tpl rename to practice/18.templating/wordpress/charts/common/templates/validations/_mongodb.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/validations/_postgresql.tpl b/practice/18.templating/wordpress/charts/common/templates/validations/_postgresql.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/validations/_postgresql.tpl rename to practice/18.templating/wordpress/charts/common/templates/validations/_postgresql.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/validations/_redis.tpl b/practice/18.templating/wordpress/charts/common/templates/validations/_redis.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/validations/_redis.tpl rename to practice/18.templating/wordpress/charts/common/templates/validations/_redis.tpl diff --git a/practice/13.templating/wordpress/charts/common/templates/validations/_validations.tpl b/practice/18.templating/wordpress/charts/common/templates/validations/_validations.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/common/templates/validations/_validations.tpl rename to practice/18.templating/wordpress/charts/common/templates/validations/_validations.tpl diff --git a/practice/13.templating/wordpress/charts/common/values.yaml b/practice/18.templating/wordpress/charts/common/values.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/common/values.yaml rename to practice/18.templating/wordpress/charts/common/values.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/.helmignore b/practice/18.templating/wordpress/charts/mariadb/.helmignore similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/.helmignore rename to practice/18.templating/wordpress/charts/mariadb/.helmignore diff --git a/practice/13.templating/wordpress/charts/mariadb/Chart.lock b/practice/18.templating/wordpress/charts/mariadb/Chart.lock similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/Chart.lock rename to practice/18.templating/wordpress/charts/mariadb/Chart.lock diff --git a/practice/13.templating/wordpress/charts/mariadb/Chart.yaml b/practice/18.templating/wordpress/charts/mariadb/Chart.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/Chart.yaml rename to practice/18.templating/wordpress/charts/mariadb/Chart.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/README.md b/practice/18.templating/wordpress/charts/mariadb/README.md similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/README.md rename to practice/18.templating/wordpress/charts/mariadb/README.md diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/.helmignore b/practice/18.templating/wordpress/charts/mariadb/charts/common/.helmignore similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/.helmignore rename to practice/18.templating/wordpress/charts/mariadb/charts/common/.helmignore diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/Chart.yaml b/practice/18.templating/wordpress/charts/mariadb/charts/common/Chart.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/Chart.yaml rename to practice/18.templating/wordpress/charts/mariadb/charts/common/Chart.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/README.md b/practice/18.templating/wordpress/charts/mariadb/charts/common/README.md similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/README.md rename to practice/18.templating/wordpress/charts/mariadb/charts/common/README.md diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_affinities.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_affinities.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_affinities.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_affinities.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_capabilities.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_capabilities.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_capabilities.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_capabilities.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_errors.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_errors.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_errors.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_errors.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_images.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_images.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_images.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_images.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_ingress.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_ingress.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_ingress.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_ingress.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_labels.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_labels.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_labels.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_labels.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_names.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_names.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_names.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_names.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_secrets.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_secrets.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_secrets.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_secrets.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_storage.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_storage.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_storage.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_storage.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_tplvalues.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_tplvalues.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_tplvalues.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_tplvalues.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_utils.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_utils.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_utils.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_utils.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_warnings.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_warnings.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/_warnings.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/_warnings.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_cassandra.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_cassandra.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_cassandra.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_cassandra.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_mariadb.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_mariadb.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_mariadb.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_mariadb.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_mongodb.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_mongodb.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_mongodb.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_mongodb.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_postgresql.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_postgresql.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_postgresql.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_postgresql.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_redis.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_redis.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_redis.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_redis.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_validations.tpl b/practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_validations.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/templates/validations/_validations.tpl rename to practice/18.templating/wordpress/charts/mariadb/charts/common/templates/validations/_validations.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/charts/common/values.yaml b/practice/18.templating/wordpress/charts/mariadb/charts/common/values.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/charts/common/values.yaml rename to practice/18.templating/wordpress/charts/mariadb/charts/common/values.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/ci/values-production-with-rbac-and-metrics.yaml b/practice/18.templating/wordpress/charts/mariadb/ci/values-production-with-rbac-and-metrics.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/ci/values-production-with-rbac-and-metrics.yaml rename to practice/18.templating/wordpress/charts/mariadb/ci/values-production-with-rbac-and-metrics.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/NOTES.txt b/practice/18.templating/wordpress/charts/mariadb/templates/NOTES.txt similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/NOTES.txt rename to practice/18.templating/wordpress/charts/mariadb/templates/NOTES.txt diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/_helpers.tpl b/practice/18.templating/wordpress/charts/mariadb/templates/_helpers.tpl similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/_helpers.tpl rename to practice/18.templating/wordpress/charts/mariadb/templates/_helpers.tpl diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/extra-list.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/extra-list.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/extra-list.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/extra-list.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/primary/configmap.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/primary/configmap.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/primary/configmap.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/primary/configmap.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/primary/initialization-configmap.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/primary/initialization-configmap.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/primary/initialization-configmap.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/primary/initialization-configmap.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/primary/pdb.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/primary/pdb.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/primary/pdb.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/primary/pdb.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/primary/statefulset.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/primary/statefulset.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/primary/statefulset.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/primary/statefulset.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/primary/svc.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/primary/svc.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/primary/svc.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/primary/svc.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/role.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/role.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/role.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/role.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/rolebinding.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/rolebinding.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/rolebinding.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/rolebinding.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/secondary/configmap.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/secondary/configmap.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/secondary/configmap.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/secondary/configmap.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/secondary/pdb.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/secondary/pdb.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/secondary/pdb.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/secondary/pdb.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/secondary/statefulset.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/secondary/statefulset.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/secondary/statefulset.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/secondary/statefulset.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/secondary/svc.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/secondary/svc.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/secondary/svc.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/secondary/svc.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/secrets.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/secrets.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/secrets.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/secrets.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/serviceaccount.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/serviceaccount.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/serviceaccount.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/serviceaccount.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/templates/servicemonitor.yaml b/practice/18.templating/wordpress/charts/mariadb/templates/servicemonitor.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/templates/servicemonitor.yaml rename to practice/18.templating/wordpress/charts/mariadb/templates/servicemonitor.yaml diff --git a/practice/13.templating/wordpress/charts/mariadb/values.schema.json b/practice/18.templating/wordpress/charts/mariadb/values.schema.json similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/values.schema.json rename to practice/18.templating/wordpress/charts/mariadb/values.schema.json diff --git a/practice/13.templating/wordpress/charts/mariadb/values.yaml b/practice/18.templating/wordpress/charts/mariadb/values.yaml similarity index 100% rename from practice/13.templating/wordpress/charts/mariadb/values.yaml rename to practice/18.templating/wordpress/charts/mariadb/values.yaml diff --git a/practice/13.templating/wordpress/ci/ct-values.yaml b/practice/18.templating/wordpress/ci/ct-values.yaml similarity index 100% rename from practice/13.templating/wordpress/ci/ct-values.yaml rename to practice/18.templating/wordpress/ci/ct-values.yaml diff --git a/practice/13.templating/wordpress/ci/ingress-wildcard-values.yaml b/practice/18.templating/wordpress/ci/ingress-wildcard-values.yaml similarity index 100% rename from practice/13.templating/wordpress/ci/ingress-wildcard-values.yaml rename to practice/18.templating/wordpress/ci/ingress-wildcard-values.yaml diff --git a/practice/13.templating/wordpress/ci/values-hpa-pdb.yaml b/practice/18.templating/wordpress/ci/values-hpa-pdb.yaml similarity index 100% rename from practice/13.templating/wordpress/ci/values-hpa-pdb.yaml rename to practice/18.templating/wordpress/ci/values-hpa-pdb.yaml diff --git a/practice/13.templating/wordpress/ci/values-metrics-and-ingress.yaml b/practice/18.templating/wordpress/ci/values-metrics-and-ingress.yaml similarity index 100% rename from practice/13.templating/wordpress/ci/values-metrics-and-ingress.yaml rename to practice/18.templating/wordpress/ci/values-metrics-and-ingress.yaml diff --git a/practice/13.templating/wordpress/templates/NOTES.txt b/practice/18.templating/wordpress/templates/NOTES.txt similarity index 100% rename from practice/13.templating/wordpress/templates/NOTES.txt rename to practice/18.templating/wordpress/templates/NOTES.txt diff --git a/practice/13.templating/wordpress/templates/_helpers.tpl b/practice/18.templating/wordpress/templates/_helpers.tpl similarity index 100% rename from practice/13.templating/wordpress/templates/_helpers.tpl rename to practice/18.templating/wordpress/templates/_helpers.tpl diff --git a/practice/13.templating/wordpress/templates/configmap.yaml b/practice/18.templating/wordpress/templates/configmap.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/configmap.yaml rename to practice/18.templating/wordpress/templates/configmap.yaml diff --git a/practice/13.templating/wordpress/templates/deployment.yaml b/practice/18.templating/wordpress/templates/deployment.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/deployment.yaml rename to practice/18.templating/wordpress/templates/deployment.yaml diff --git a/practice/13.templating/wordpress/templates/externaldb-secrets.yaml b/practice/18.templating/wordpress/templates/externaldb-secrets.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/externaldb-secrets.yaml rename to practice/18.templating/wordpress/templates/externaldb-secrets.yaml diff --git a/practice/13.templating/wordpress/templates/extra-list.yaml b/practice/18.templating/wordpress/templates/extra-list.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/extra-list.yaml rename to practice/18.templating/wordpress/templates/extra-list.yaml diff --git a/practice/13.templating/wordpress/templates/hpa.yaml b/practice/18.templating/wordpress/templates/hpa.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/hpa.yaml rename to practice/18.templating/wordpress/templates/hpa.yaml diff --git a/practice/13.templating/wordpress/templates/ingress.yaml b/practice/18.templating/wordpress/templates/ingress.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/ingress.yaml rename to practice/18.templating/wordpress/templates/ingress.yaml diff --git a/practice/13.templating/wordpress/templates/metrics-svc.yaml b/practice/18.templating/wordpress/templates/metrics-svc.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/metrics-svc.yaml rename to practice/18.templating/wordpress/templates/metrics-svc.yaml diff --git a/practice/13.templating/wordpress/templates/pdb.yaml b/practice/18.templating/wordpress/templates/pdb.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/pdb.yaml rename to practice/18.templating/wordpress/templates/pdb.yaml diff --git a/practice/13.templating/wordpress/templates/pvc.yaml b/practice/18.templating/wordpress/templates/pvc.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/pvc.yaml rename to practice/18.templating/wordpress/templates/pvc.yaml diff --git a/practice/13.templating/wordpress/templates/secrets.yaml b/practice/18.templating/wordpress/templates/secrets.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/secrets.yaml rename to practice/18.templating/wordpress/templates/secrets.yaml diff --git a/practice/13.templating/wordpress/templates/servicemonitor.yaml b/practice/18.templating/wordpress/templates/servicemonitor.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/servicemonitor.yaml rename to practice/18.templating/wordpress/templates/servicemonitor.yaml diff --git a/practice/13.templating/wordpress/templates/svc.yaml b/practice/18.templating/wordpress/templates/svc.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/svc.yaml rename to practice/18.templating/wordpress/templates/svc.yaml diff --git a/practice/13.templating/wordpress/templates/tests/test-mariadb-connection.yaml b/practice/18.templating/wordpress/templates/tests/test-mariadb-connection.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/tests/test-mariadb-connection.yaml rename to practice/18.templating/wordpress/templates/tests/test-mariadb-connection.yaml diff --git a/practice/13.templating/wordpress/templates/tls-secrets.yaml b/practice/18.templating/wordpress/templates/tls-secrets.yaml similarity index 100% rename from practice/13.templating/wordpress/templates/tls-secrets.yaml rename to practice/18.templating/wordpress/templates/tls-secrets.yaml diff --git a/practice/13.templating/wordpress/values.schema.json b/practice/18.templating/wordpress/values.schema.json similarity index 100% rename from practice/13.templating/wordpress/values.schema.json rename to practice/18.templating/wordpress/values.schema.json diff --git a/practice/13.templating/wordpress/values.yaml b/practice/18.templating/wordpress/values.yaml similarity index 100% rename from practice/13.templating/wordpress/values.yaml rename to practice/18.templating/wordpress/values.yaml diff --git a/practice/15.kubernetes-features-for-app/.gitkeep b/practice/19.kubernetes-features-for-app/.gitkeep similarity index 100% rename from practice/15.kubernetes-features-for-app/.gitkeep rename to practice/19.kubernetes-features-for-app/.gitkeep diff --git a/practice/14.ci-cd/1.1.prepare_cluster/README.md b/practice/21.ci-cd/1.1.prepare_cluster/README.md similarity index 100% rename from practice/14.ci-cd/1.1.prepare_cluster/README.md rename to practice/21.ci-cd/1.1.prepare_cluster/README.md diff --git a/practice/14.ci-cd/1.1.prepare_cluster/docker_pull_secret.sh b/practice/21.ci-cd/1.1.prepare_cluster/docker_pull_secret.sh similarity index 100% rename from practice/14.ci-cd/1.1.prepare_cluster/docker_pull_secret.sh rename to practice/21.ci-cd/1.1.prepare_cluster/docker_pull_secret.sh diff --git a/practice/14.ci-cd/1.1.prepare_cluster/setup.sh b/practice/21.ci-cd/1.1.prepare_cluster/setup.sh similarity index 100% rename from practice/14.ci-cd/1.1.prepare_cluster/setup.sh rename to practice/21.ci-cd/1.1.prepare_cluster/setup.sh diff --git a/practice/14.ci-cd/1.1.prepare_cluster/xpaste_secret.sh b/practice/21.ci-cd/1.1.prepare_cluster/xpaste_secret.sh similarity index 100% rename from practice/14.ci-cd/1.1.prepare_cluster/xpaste_secret.sh rename to practice/21.ci-cd/1.1.prepare_cluster/xpaste_secret.sh diff --git a/practice/14.ci-cd/1.2.deploy/.gitlab-ci.yml b/practice/21.ci-cd/1.2.deploy/.gitlab-ci.yml similarity index 100% rename from practice/14.ci-cd/1.2.deploy/.gitlab-ci.yml rename to practice/21.ci-cd/1.2.deploy/.gitlab-ci.yml diff --git a/practice/14.ci-cd/1.2.deploy/README.md b/practice/21.ci-cd/1.2.deploy/README.md similarity index 100% rename from practice/14.ci-cd/1.2.deploy/README.md rename to practice/21.ci-cd/1.2.deploy/README.md diff --git a/practice/14.ci-cd/1.3.logs/.gitlab-ci.yml b/practice/21.ci-cd/1.3.logs/.gitlab-ci.yml similarity index 100% rename from practice/14.ci-cd/1.3.logs/.gitlab-ci.yml rename to practice/21.ci-cd/1.3.logs/.gitlab-ci.yml diff --git a/practice/14.ci-cd/1.3.logs/README.md b/practice/21.ci-cd/1.3.logs/README.md similarity index 100% rename from practice/14.ci-cd/1.3.logs/README.md rename to practice/21.ci-cd/1.3.logs/README.md diff --git a/practice/14.ci-cd/1.3.logs/job.yaml b/practice/21.ci-cd/1.3.logs/job.yaml similarity index 100% rename from practice/14.ci-cd/1.3.logs/job.yaml rename to practice/21.ci-cd/1.3.logs/job.yaml diff --git a/practice/14.ci-cd/1.3.logs/scripts/hooklog.sh b/practice/21.ci-cd/1.3.logs/scripts/hooklog.sh similarity index 100% rename from practice/14.ci-cd/1.3.logs/scripts/hooklog.sh rename to practice/21.ci-cd/1.3.logs/scripts/hooklog.sh diff --git a/practice/14.ci-cd/1.4.improvement_cicd/.gitlab-ci.yml b/practice/21.ci-cd/1.4.improvement_cicd/.gitlab-ci.yml similarity index 100% rename from practice/14.ci-cd/1.4.improvement_cicd/.gitlab-ci.yml rename to practice/21.ci-cd/1.4.improvement_cicd/.gitlab-ci.yml diff --git a/practice/14.ci-cd/1.4.improvement_cicd/README.md b/practice/21.ci-cd/1.4.improvement_cicd/README.md similarity index 100% rename from practice/14.ci-cd/1.4.improvement_cicd/README.md rename to practice/21.ci-cd/1.4.improvement_cicd/README.md diff --git a/practice/14.ci-cd/1.5.two_containers/README.md b/practice/21.ci-cd/1.5.two_containers/README.md similarity index 100% rename from practice/14.ci-cd/1.5.two_containers/README.md rename to practice/21.ci-cd/1.5.two_containers/README.md diff --git a/practice/14.ci-cd/1.5.two_containers/deployment.yaml b/practice/21.ci-cd/1.5.two_containers/deployment.yaml similarity index 100% rename from practice/14.ci-cd/1.5.two_containers/deployment.yaml rename to practice/21.ci-cd/1.5.two_containers/deployment.yaml diff --git a/practice/14.ci-cd/1.6.job.migration/README.md b/practice/21.ci-cd/1.6.job.migration/README.md similarity index 100% rename from practice/14.ci-cd/1.6.job.migration/README.md rename to practice/21.ci-cd/1.6.job.migration/README.md diff --git a/practice/14.ci-cd/1.6.job.migration/deployment.yaml b/practice/21.ci-cd/1.6.job.migration/deployment.yaml similarity index 100% rename from practice/14.ci-cd/1.6.job.migration/deployment.yaml rename to practice/21.ci-cd/1.6.job.migration/deployment.yaml diff --git a/practice/14.ci-cd/1.6.job.migration/job.migrate.yaml b/practice/21.ci-cd/1.6.job.migration/job.migrate.yaml similarity index 100% rename from practice/14.ci-cd/1.6.job.migration/job.migrate.yaml rename to practice/21.ci-cd/1.6.job.migration/job.migrate.yaml diff --git a/practice/14.ci-cd/README.md b/practice/21.ci-cd/README.md similarity index 100% rename from practice/14.ci-cd/README.md rename to practice/21.ci-cd/README.md diff --git a/practice/3.saving-configurations/1.env/README.md b/practice/4.saving-configurations/1.env/README.md similarity index 100% rename from practice/3.saving-configurations/1.env/README.md rename to practice/4.saving-configurations/1.env/README.md diff --git a/practice/9.cluster-authorization/1.rbac/configmap.yaml b/practice/4.saving-configurations/1.env/configmap.yaml similarity index 100% rename from practice/9.cluster-authorization/1.rbac/configmap.yaml rename to practice/4.saving-configurations/1.env/configmap.yaml diff --git a/practice/3.saving-configurations/1.env/deployment-with-env-cm.yaml b/practice/4.saving-configurations/1.env/deployment-with-env-cm.yaml similarity index 100% rename from practice/3.saving-configurations/1.env/deployment-with-env-cm.yaml rename to practice/4.saving-configurations/1.env/deployment-with-env-cm.yaml diff --git a/practice/3.saving-configurations/1.env/deployment-with-env.yaml b/practice/4.saving-configurations/1.env/deployment-with-env.yaml similarity index 100% rename from practice/3.saving-configurations/1.env/deployment-with-env.yaml rename to practice/4.saving-configurations/1.env/deployment-with-env.yaml diff --git a/practice/3.saving-configurations/2.secret/README.md b/practice/4.saving-configurations/2.secret/README.md similarity index 100% rename from practice/3.saving-configurations/2.secret/README.md rename to practice/4.saving-configurations/2.secret/README.md diff --git a/practice/3.saving-configurations/2.secret/deployment-with-secret.yaml b/practice/4.saving-configurations/2.secret/deployment-with-secret.yaml similarity index 100% rename from practice/3.saving-configurations/2.secret/deployment-with-secret.yaml rename to practice/4.saving-configurations/2.secret/deployment-with-secret.yaml diff --git a/practice/3.saving-configurations/2.secret/secret.yaml b/practice/4.saving-configurations/2.secret/secret.yaml similarity index 100% rename from practice/3.saving-configurations/2.secret/secret.yaml rename to practice/4.saving-configurations/2.secret/secret.yaml diff --git a/practice/3.saving-configurations/3.configmap/README.md b/practice/4.saving-configurations/3.configmap/README.md similarity index 100% rename from practice/3.saving-configurations/3.configmap/README.md rename to practice/4.saving-configurations/3.configmap/README.md diff --git a/practice/3.saving-configurations/3.configmap/configmap.yaml b/practice/4.saving-configurations/3.configmap/configmap.yaml similarity index 100% rename from practice/3.saving-configurations/3.configmap/configmap.yaml rename to practice/4.saving-configurations/3.configmap/configmap.yaml diff --git a/practice/3.saving-configurations/3.configmap/deployment-with-configmap.yaml b/practice/4.saving-configurations/3.configmap/deployment-with-configmap.yaml similarity index 100% rename from practice/3.saving-configurations/3.configmap/deployment-with-configmap.yaml rename to practice/4.saving-configurations/3.configmap/deployment-with-configmap.yaml diff --git a/practice/3.saving-configurations/4.downward/README.md b/practice/4.saving-configurations/4.downward/README.md similarity index 100% rename from practice/3.saving-configurations/4.downward/README.md rename to practice/4.saving-configurations/4.downward/README.md diff --git a/practice/3.saving-configurations/4.downward/deployment-with-downward-api.yaml b/practice/4.saving-configurations/4.downward/deployment-with-downward-api.yaml similarity index 100% rename from practice/3.saving-configurations/4.downward/deployment-with-downward-api.yaml rename to practice/4.saving-configurations/4.downward/deployment-with-downward-api.yaml diff --git a/practice/5.network-abstractions/2.ingress-and-services/nginx-ingress.yaml b/practice/5.network-abstractions/2.ingress-and-services/nginx-ingress.yaml deleted file mode 100644 index 5cfad95..0000000 --- a/practice/5.network-abstractions/2.ingress-and-services/nginx-ingress.yaml +++ /dev/null @@ -1,17 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - name: my-ingress-nginx - annotations: - kubernetes.io/ingress.class: "nginx" -spec: - rules: - - http: - paths: - - pathType: Prefix - path: "/" - backend: - service: - name: my-service - port: - number: 80 diff --git a/practice/5.network-abstractions/2.ingress-and-services/right_answers/.gitkeep b/practice/5.network-abstractions/2.ingress-and-services/right_answers/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/practice/4.saving-data/1.hostpath/README.md b/practice/5.saving-data/1.hostpath/README.md similarity index 100% rename from practice/4.saving-data/1.hostpath/README.md rename to practice/5.saving-data/1.hostpath/README.md diff --git a/practice/4.saving-data/1.hostpath/deployment.yaml b/practice/5.saving-data/1.hostpath/deployment.yaml similarity index 100% rename from practice/4.saving-data/1.hostpath/deployment.yaml rename to practice/5.saving-data/1.hostpath/deployment.yaml diff --git a/practice/4.saving-data/2.emptydir/README.md b/practice/5.saving-data/2.emptydir/README.md similarity index 100% rename from practice/4.saving-data/2.emptydir/README.md rename to practice/5.saving-data/2.emptydir/README.md diff --git a/practice/4.saving-data/2.emptydir/deployment.yaml b/practice/5.saving-data/2.emptydir/deployment.yaml similarity index 100% rename from practice/4.saving-data/2.emptydir/deployment.yaml rename to practice/5.saving-data/2.emptydir/deployment.yaml diff --git a/practice/4.saving-data/3.pvc/README.md b/practice/5.saving-data/3.pvc/README.md similarity index 100% rename from practice/4.saving-data/3.pvc/README.md rename to practice/5.saving-data/3.pvc/README.md diff --git a/practice/4.saving-data/3.pvc/configmap.yaml b/practice/5.saving-data/3.pvc/configmap.yaml similarity index 100% rename from practice/4.saving-data/3.pvc/configmap.yaml rename to practice/5.saving-data/3.pvc/configmap.yaml diff --git a/practice/4.saving-data/3.pvc/deployment.yaml b/practice/5.saving-data/3.pvc/deployment.yaml similarity index 100% rename from practice/4.saving-data/3.pvc/deployment.yaml rename to practice/5.saving-data/3.pvc/deployment.yaml diff --git a/practice/4.saving-data/3.pvc/pvc.yaml b/practice/5.saving-data/3.pvc/pvc.yaml similarity index 100% rename from practice/4.saving-data/3.pvc/pvc.yaml rename to practice/5.saving-data/3.pvc/pvc.yaml diff --git a/practice/5.network-abstractions/1.probes/README.md b/practice/7.network-abstractions/1.probes/README.md similarity index 100% rename from practice/5.network-abstractions/1.probes/README.md rename to practice/7.network-abstractions/1.probes/README.md diff --git a/practice/5.network-abstractions/1.probes/deployment-with-stuff.yaml b/practice/7.network-abstractions/1.probes/deployment-with-stuff.yaml similarity index 100% rename from practice/5.network-abstractions/1.probes/deployment-with-stuff.yaml rename to practice/7.network-abstractions/1.probes/deployment-with-stuff.yaml diff --git a/practice/5.network-abstractions/2.ingress-and-services/README.md b/practice/7.network-abstractions/2.ingress-and-services/README.md similarity index 53% rename from practice/5.network-abstractions/2.ingress-and-services/README.md rename to practice/7.network-abstractions/2.ingress-and-services/README.md index b250b26..9be2d59 100644 --- a/practice/5.network-abstractions/2.ingress-and-services/README.md +++ b/practice/7.network-abstractions/2.ingress-and-services/README.md @@ -34,31 +34,16 @@ curl my-service exit ``` -5) Создаем Service типа Nodeport: +## Важно! На Service'ы типа NodePort и LoadBalancer просто смотрим. Их в кластере не создаем! + +5) Смотрим как выглядят Service'ы типа Nodeport и LoadBalancer: ```bash -kubectl apply -f nodeport.yaml +cat nodeport.yaml +cat loadbalancer.yaml ``` -6) Проверяем что все ОК. Смотрим наши Service'ы, находим NodePort. Фиксируем, какой порт нам открылся и проверяем работу Service'а: - -```bash -kubectl get svc - -curl node-1.slurm.io:<свой номер порта> - -curl master-1.slurm.io:<свой номер порта> -``` - -7) Создаем Service LoadBalancer: - -```bash -kubectl create -f loadbalancer.yaml - -kubectl get svc -``` - -8) Подчищаем за собой: +6) Подчищаем за собой: ```bash kubectl delete svc my-service-lb my-service-np @@ -66,22 +51,19 @@ kubectl delete svc my-service-lb my-service-np ## Разбираемся с Ingress'ами -1) Создадим Ingress без указания хоста: +1) Создадим Ingress, предварительно поправив плейсхолдер: ```bash -kubectl apply -f nginx-ingress.yaml +vim host-ingress.yaml + +kubectl apply -f host-ingress.yaml kubectl get ing ``` -2) Попробуем покурлить разные домены: +2) Попробуем покурлить: ```bash curl my.s<свой номер логина>.k8s.slurm.io curl notmy.s<свой номер логина>.k8s.slurm.io ``` - -**САМОСТОЯТЕЛЬНАЯ РАБОТА:** -- Подправить Ingress таким образом, чтобы он работал только на домене `my.s<свой номер логина>.k8s.slurm.io` - -Правильный ответ лежит в `right_answers/` diff --git a/practice/5.network-abstractions/2.ingress-and-services/app/configmap.yaml b/practice/7.network-abstractions/2.ingress-and-services/app/configmap.yaml similarity index 100% rename from practice/5.network-abstractions/2.ingress-and-services/app/configmap.yaml rename to practice/7.network-abstractions/2.ingress-and-services/app/configmap.yaml diff --git a/practice/5.network-abstractions/2.ingress-and-services/app/deployment-with-configmap.yaml b/practice/7.network-abstractions/2.ingress-and-services/app/deployment-with-configmap.yaml similarity index 100% rename from practice/5.network-abstractions/2.ingress-and-services/app/deployment-with-configmap.yaml rename to practice/7.network-abstractions/2.ingress-and-services/app/deployment-with-configmap.yaml diff --git a/practice/5.network-abstractions/2.ingress-and-services/clusterip.yaml b/practice/7.network-abstractions/2.ingress-and-services/clusterip.yaml similarity index 100% rename from practice/5.network-abstractions/2.ingress-and-services/clusterip.yaml rename to practice/7.network-abstractions/2.ingress-and-services/clusterip.yaml diff --git a/practice/5.network-abstractions/2.ingress-and-services/right_answers/host-ingress.yaml b/practice/7.network-abstractions/2.ingress-and-services/host-ingress.yaml similarity index 85% rename from practice/5.network-abstractions/2.ingress-and-services/right_answers/host-ingress.yaml rename to practice/7.network-abstractions/2.ingress-and-services/host-ingress.yaml index ee2e4c1..041d558 100644 --- a/practice/5.network-abstractions/2.ingress-and-services/right_answers/host-ingress.yaml +++ b/practice/7.network-abstractions/2.ingress-and-services/host-ingress.yaml @@ -2,8 +2,6 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: my-ingress-nginx - annotations: - kubernetes.io/ingress.class: "nginx" spec: rules: - host: my.s<свой номер логина>.k8s.slurm.io diff --git a/practice/5.network-abstractions/2.ingress-and-services/loadbalancer.yaml b/practice/7.network-abstractions/2.ingress-and-services/loadbalancer.yaml similarity index 100% rename from practice/5.network-abstractions/2.ingress-and-services/loadbalancer.yaml rename to practice/7.network-abstractions/2.ingress-and-services/loadbalancer.yaml diff --git a/practice/5.network-abstractions/2.ingress-and-services/nodeport.yaml b/practice/7.network-abstractions/2.ingress-and-services/nodeport.yaml similarity index 100% rename from practice/5.network-abstractions/2.ingress-and-services/nodeport.yaml rename to practice/7.network-abstractions/2.ingress-and-services/nodeport.yaml diff --git a/practice/11.local-development/README.md b/practice/9.local-development/README.md similarity index 100% rename from practice/11.local-development/README.md rename to practice/9.local-development/README.md diff --git a/practice/11.local-development/app/Dockerfile b/practice/9.local-development/app/Dockerfile similarity index 100% rename from practice/11.local-development/app/Dockerfile rename to practice/9.local-development/app/Dockerfile diff --git a/practice/11.local-development/app/app.py b/practice/9.local-development/app/app.py similarity index 100% rename from practice/11.local-development/app/app.py rename to practice/9.local-development/app/app.py diff --git a/practice/11.local-development/app/kube/deployment.yaml b/practice/9.local-development/app/kube/deployment.yaml similarity index 100% rename from practice/11.local-development/app/kube/deployment.yaml rename to practice/9.local-development/app/kube/deployment.yaml diff --git a/practice/11.local-development/app/kube/service.yaml b/practice/9.local-development/app/kube/service.yaml similarity index 100% rename from practice/11.local-development/app/kube/service.yaml rename to practice/9.local-development/app/kube/service.yaml diff --git a/practice/11.local-development/app/requirements.txt b/practice/9.local-development/app/requirements.txt similarity index 100% rename from practice/11.local-development/app/requirements.txt rename to practice/9.local-development/app/requirements.txt