From f990be6d7eb272d1f0903cef0db939d14359d0d7 Mon Sep 17 00:00:00 2001 From: Sergey Bondarev Date: Tue, 2 Nov 2021 14:17:38 +0300 Subject: [PATCH] fix numeration --- .../1.rbac/README.md | 2 +- .../1.rbac/configmap.yaml | 0 .../1.rbac/rolebinding.yaml | 0 .../1.rbac/secret.yml | 0 .../1.rbac/serviceaccount.yaml | 0 .../1.pod/README.md | 6 +++--- .../1.pod/pod.yaml | 0 .../2.replicaset/README.md | 6 +++--- .../2.replicaset/pod.yaml | 0 .../2.replicaset/replicaset.yaml | 0 .../3.deployment/README.md | 2 +- .../3.deployment/deployment.yaml | 0 .../4.resources/README.md | 2 +- .../4.resources/deployment-with-resources.yaml | 0 .../1.probes/README.md | 6 +++--- .../1.probes/deployment-with-stuff.yaml | 0 .../2.ingress-and-services/README.md | 2 +- .../2.ingress-and-services/app/configmap.yaml | 0 .../app/deployment-with-configmap.yaml | 0 .../2.ingress-and-services/clusterip.yaml | 0 .../2.ingress-and-services/host-ingress.yaml | 0 .../2.ingress-and-services/loadbalancer.yaml | 0 .../2.ingress-and-services/nodeport.yaml | 0 .../{9.local-development => 8.local-development}/README.md | 6 +++--- .../app/Dockerfile | 0 .../{9.local-development => 8.local-development}/app/app.py | 0 .../app/kube/deployment.yaml | 0 .../app/kube/service.yaml | 0 .../app/requirements.txt | 0 .../problems_window.md | 0 .../{10.oneshot-tasks => 9.oneshot-tasks}/1.job/README.md | 6 +++--- .../{10.oneshot-tasks => 9.oneshot-tasks}/1.job/job.yaml | 0 .../2.cronjob/README.md | 4 ++-- .../2.cronjob/cronjob.yaml | 0 34 files changed, 21 insertions(+), 21 deletions(-) rename practice/{13.cluster-authorization => 11.cluster-authorization}/1.rbac/README.md (97%) rename practice/{13.cluster-authorization => 11.cluster-authorization}/1.rbac/configmap.yaml (100%) rename practice/{13.cluster-authorization => 11.cluster-authorization}/1.rbac/rolebinding.yaml (100%) rename practice/{13.cluster-authorization => 11.cluster-authorization}/1.rbac/secret.yml (100%) rename practice/{13.cluster-authorization => 11.cluster-authorization}/1.rbac/serviceaccount.yaml (100%) rename practice/{2.application-abstractions => 3.application-abstractions}/1.pod/README.md (91%) rename practice/{2.application-abstractions => 3.application-abstractions}/1.pod/pod.yaml (100%) rename practice/{2.application-abstractions => 3.application-abstractions}/2.replicaset/README.md (96%) rename practice/{2.application-abstractions => 3.application-abstractions}/2.replicaset/pod.yaml (100%) rename practice/{2.application-abstractions => 3.application-abstractions}/2.replicaset/replicaset.yaml (100%) rename practice/{2.application-abstractions => 3.application-abstractions}/3.deployment/README.md (97%) rename practice/{2.application-abstractions => 3.application-abstractions}/3.deployment/deployment.yaml (100%) rename practice/{2.application-abstractions => 3.application-abstractions}/4.resources/README.md (96%) rename practice/{2.application-abstractions => 3.application-abstractions}/4.resources/deployment-with-resources.yaml (100%) rename practice/{7.network-abstractions => 6.network-abstractions}/1.probes/README.md (84%) rename practice/{7.network-abstractions => 6.network-abstractions}/1.probes/deployment-with-stuff.yaml (100%) rename practice/{7.network-abstractions => 6.network-abstractions}/2.ingress-and-services/README.md (96%) rename practice/{7.network-abstractions => 6.network-abstractions}/2.ingress-and-services/app/configmap.yaml (100%) rename practice/{7.network-abstractions => 6.network-abstractions}/2.ingress-and-services/app/deployment-with-configmap.yaml (100%) rename practice/{7.network-abstractions => 6.network-abstractions}/2.ingress-and-services/clusterip.yaml (100%) rename practice/{7.network-abstractions => 6.network-abstractions}/2.ingress-and-services/host-ingress.yaml (100%) rename practice/{7.network-abstractions => 6.network-abstractions}/2.ingress-and-services/loadbalancer.yaml (100%) rename practice/{7.network-abstractions => 6.network-abstractions}/2.ingress-and-services/nodeport.yaml (100%) rename practice/{9.local-development => 8.local-development}/README.md (94%) rename practice/{9.local-development => 8.local-development}/app/Dockerfile (100%) rename practice/{9.local-development => 8.local-development}/app/app.py (100%) rename practice/{9.local-development => 8.local-development}/app/kube/deployment.yaml (100%) rename practice/{9.local-development => 8.local-development}/app/kube/service.yaml (100%) rename practice/{9.local-development => 8.local-development}/app/requirements.txt (100%) rename practice/{9.local-development => 8.local-development}/problems_window.md (100%) rename practice/{10.oneshot-tasks => 9.oneshot-tasks}/1.job/README.md (94%) rename practice/{10.oneshot-tasks => 9.oneshot-tasks}/1.job/job.yaml (100%) rename practice/{10.oneshot-tasks => 9.oneshot-tasks}/2.cronjob/README.md (86%) rename practice/{10.oneshot-tasks => 9.oneshot-tasks}/2.cronjob/cronjob.yaml (100%) diff --git a/practice/13.cluster-authorization/1.rbac/README.md b/practice/11.cluster-authorization/1.rbac/README.md similarity index 97% rename from practice/13.cluster-authorization/1.rbac/README.md rename to practice/11.cluster-authorization/1.rbac/README.md index 603a718..1546bca 100644 --- a/practice/13.cluster-authorization/1.rbac/README.md +++ b/practice/11.cluster-authorization/1.rbac/README.md @@ -5,7 +5,7 @@ Исправляем название namespace в rolebinding ```bash -cd ~/slurm/practice/13.cluster-authorization/1.rbac +cd ~/slurm/practice/11.cluster-authorization/1.rbac vim rolebinding.yaml ``` diff --git a/practice/13.cluster-authorization/1.rbac/configmap.yaml b/practice/11.cluster-authorization/1.rbac/configmap.yaml similarity index 100% rename from practice/13.cluster-authorization/1.rbac/configmap.yaml rename to practice/11.cluster-authorization/1.rbac/configmap.yaml diff --git a/practice/13.cluster-authorization/1.rbac/rolebinding.yaml b/practice/11.cluster-authorization/1.rbac/rolebinding.yaml similarity index 100% rename from practice/13.cluster-authorization/1.rbac/rolebinding.yaml rename to practice/11.cluster-authorization/1.rbac/rolebinding.yaml diff --git a/practice/13.cluster-authorization/1.rbac/secret.yml b/practice/11.cluster-authorization/1.rbac/secret.yml similarity index 100% rename from practice/13.cluster-authorization/1.rbac/secret.yml rename to practice/11.cluster-authorization/1.rbac/secret.yml diff --git a/practice/13.cluster-authorization/1.rbac/serviceaccount.yaml b/practice/11.cluster-authorization/1.rbac/serviceaccount.yaml similarity index 100% rename from practice/13.cluster-authorization/1.rbac/serviceaccount.yaml rename to practice/11.cluster-authorization/1.rbac/serviceaccount.yaml diff --git a/practice/2.application-abstractions/1.pod/README.md b/practice/3.application-abstractions/1.pod/README.md similarity index 91% rename from practice/2.application-abstractions/1.pod/README.md rename to practice/3.application-abstractions/1.pod/README.md index 59c2727..6b0c9e0 100644 --- a/practice/2.application-abstractions/1.pod/README.md +++ b/practice/3.application-abstractions/1.pod/README.md @@ -5,7 +5,7 @@ Для этого выполним команду: ```bash -kubectl apply -f ~/school-dev-k8s/practice/2.application-abstractions/1.pod/pod.yaml +kubectl apply -f ~/school-dev-k8s/practice/3.application-abstractions/1.pod/pod.yaml ``` Проверим результат, для чего выполним команду: @@ -34,7 +34,7 @@ my-pod 1/1 Running 0 59s Открываем файл pod.yaml редактором: ```bash -vim ~/school-dev-k8s/practice/2.application-abstractions/1.pod/pod.yaml +vim ~/school-dev-k8s/practice/3.application-abstractions/1.pod/pod.yaml ``` Входим в режим редактирования нажатием `i` и заменяем там строку: @@ -55,7 +55,7 @@ vim ~/school-dev-k8s/practice/2.application-abstractions/1.pod/pod.yaml Применяем изменения, для этого выполним команду: ```bash -kubectl apply -f ~/school-dev-k8s/practice/2.application-abstractions/1.pod/pod.yaml +kubectl apply -f ~/school-dev-k8s/practice/3.application-abstractions/1.pod/pod.yaml ``` Проверяем результат, для этого выполним команду: diff --git a/practice/2.application-abstractions/1.pod/pod.yaml b/practice/3.application-abstractions/1.pod/pod.yaml similarity index 100% rename from practice/2.application-abstractions/1.pod/pod.yaml rename to practice/3.application-abstractions/1.pod/pod.yaml diff --git a/practice/2.application-abstractions/2.replicaset/README.md b/practice/3.application-abstractions/2.replicaset/README.md similarity index 96% rename from practice/2.application-abstractions/2.replicaset/README.md rename to practice/3.application-abstractions/2.replicaset/README.md index 92f9ac8..ecfde41 100644 --- a/practice/2.application-abstractions/2.replicaset/README.md +++ b/practice/3.application-abstractions/2.replicaset/README.md @@ -5,7 +5,7 @@ Для этого выполним команду: ```bash -kubectl apply -f ~/school-dev-k8s/practice/2.application-abstractions/2.replicaset/replicaset.yaml +kubectl apply -f ~/school-dev-k8s/practice/3.application-abstractions/2.replicaset/replicaset.yaml ``` Проверим результат, для этого выполним команду: @@ -76,7 +76,7 @@ my-replicaset-z7rwm 0/1 Terminating 0 4m Открываем файл `2.replicaset/pod.yaml` ```bash -vim ~/school-dev-k8s/practice/2.application-abstractions/2.replicaset/pod.yaml +vim ~/school-dev-k8s/practice/3.application-abstractions/2.replicaset/pod.yaml ``` И в него после metadata: на следующей строке добавляем: @@ -104,7 +104,7 @@ spec: Создаем дополнительный Pod, для этого выполним команду: ```bash -kubectl apply -f ~/school-dev-k8s/practice/2.application-abstractions/2.replicaset/pod.yaml +kubectl apply -f ~/school-dev-k8s/practice/3.application-abstractions/2.replicaset/pod.yaml ``` Проверяем результат, для этого выполним команду: diff --git a/practice/2.application-abstractions/2.replicaset/pod.yaml b/practice/3.application-abstractions/2.replicaset/pod.yaml similarity index 100% rename from practice/2.application-abstractions/2.replicaset/pod.yaml rename to practice/3.application-abstractions/2.replicaset/pod.yaml diff --git a/practice/2.application-abstractions/2.replicaset/replicaset.yaml b/practice/3.application-abstractions/2.replicaset/replicaset.yaml similarity index 100% rename from practice/2.application-abstractions/2.replicaset/replicaset.yaml rename to practice/3.application-abstractions/2.replicaset/replicaset.yaml diff --git a/practice/2.application-abstractions/3.deployment/README.md b/practice/3.application-abstractions/3.deployment/README.md similarity index 97% rename from practice/2.application-abstractions/3.deployment/README.md rename to practice/3.application-abstractions/3.deployment/README.md index 81372b8..4045231 100644 --- a/practice/2.application-abstractions/3.deployment/README.md +++ b/practice/3.application-abstractions/3.deployment/README.md @@ -5,7 +5,7 @@ Для этого выполним команду: ```bash -kubectl apply -f ~/school-dev-k8s/practice/2.application-abstractions/3.deployment/ +kubectl apply -f ~/school-dev-k8s/practice/3.application-abstractions/3.deployment/ ``` Проверяем список pods, для этого выполним команду: diff --git a/practice/2.application-abstractions/3.deployment/deployment.yaml b/practice/3.application-abstractions/3.deployment/deployment.yaml similarity index 100% rename from practice/2.application-abstractions/3.deployment/deployment.yaml rename to practice/3.application-abstractions/3.deployment/deployment.yaml diff --git a/practice/2.application-abstractions/4.resources/README.md b/practice/3.application-abstractions/4.resources/README.md similarity index 96% rename from practice/2.application-abstractions/4.resources/README.md rename to practice/3.application-abstractions/4.resources/README.md index b4943f9..6863810 100644 --- a/practice/2.application-abstractions/4.resources/README.md +++ b/practice/3.application-abstractions/4.resources/README.md @@ -3,7 +3,7 @@ ## 1. Создаем deployment с ресурсами ```bash -kubectl apply -f ~/school-dev-k8s/practice/2.application-abstractions/4.resources/ +kubectl apply -f ~/school-dev-k8s/practice/3.application-abstractions/4.resources/ ``` Смотрим что получилось diff --git a/practice/2.application-abstractions/4.resources/deployment-with-resources.yaml b/practice/3.application-abstractions/4.resources/deployment-with-resources.yaml similarity index 100% rename from practice/2.application-abstractions/4.resources/deployment-with-resources.yaml rename to practice/3.application-abstractions/4.resources/deployment-with-resources.yaml diff --git a/practice/7.network-abstractions/1.probes/README.md b/practice/6.network-abstractions/1.probes/README.md similarity index 84% rename from practice/7.network-abstractions/1.probes/README.md rename to practice/6.network-abstractions/1.probes/README.md index 2a53b25..165521c 100644 --- a/practice/7.network-abstractions/1.probes/README.md +++ b/practice/6.network-abstractions/1.probes/README.md @@ -3,7 +3,7 @@ Создаем deployment с ресурсами и пробами ```bash -kubectl apply -f ~/school-dev-k8s/practice/7.network-abstractions/1.probes/deployment-with-stuff.yaml +kubectl apply -f ~/school-dev-k8s/practice/6.network-abstractions/1.probes/deployment-with-stuff.yaml ``` Смотрим что получилось @@ -23,8 +23,8 @@ my-deployment-69695544f6-xcpq9 1/1 Running 0 20s Поменяем специально Readiness Probe на заведомо неверную в манифесте и применим его снова ```bash -vim ~/school-dev-k8s/practice/7.network-abstractions/1.probes/deployment-with-stuff.yaml -kubectl apply -f ~/school-dev-k8s/practice/7.network-abstractions/1.probes/deployment-with-stuff.yaml +vim ~/school-dev-k8s/practice/6.network-abstractions/1.probes/deployment-with-stuff.yaml +kubectl apply -f ~/school-dev-k8s/practice/6.network-abstractions/1.probes/deployment-with-stuff.yaml ``` Смотрим что получилось diff --git a/practice/7.network-abstractions/1.probes/deployment-with-stuff.yaml b/practice/6.network-abstractions/1.probes/deployment-with-stuff.yaml similarity index 100% rename from practice/7.network-abstractions/1.probes/deployment-with-stuff.yaml rename to practice/6.network-abstractions/1.probes/deployment-with-stuff.yaml diff --git a/practice/7.network-abstractions/2.ingress-and-services/README.md b/practice/6.network-abstractions/2.ingress-and-services/README.md similarity index 96% rename from practice/7.network-abstractions/2.ingress-and-services/README.md rename to practice/6.network-abstractions/2.ingress-and-services/README.md index 2782559..c1bfad7 100644 --- a/practice/7.network-abstractions/2.ingress-and-services/README.md +++ b/practice/6.network-abstractions/2.ingress-and-services/README.md @@ -3,7 +3,7 @@ 1) Деплоим "основное" приложение ```bash -cd ~/school-dev-k8s/practice/7.network-abstractions/2.ingress-and-services/ +cd ~/school-dev-k8s/practice/6.network-abstractions/2.ingress-and-services/ kubectl apply -f app ``` diff --git a/practice/7.network-abstractions/2.ingress-and-services/app/configmap.yaml b/practice/6.network-abstractions/2.ingress-and-services/app/configmap.yaml similarity index 100% rename from practice/7.network-abstractions/2.ingress-and-services/app/configmap.yaml rename to practice/6.network-abstractions/2.ingress-and-services/app/configmap.yaml diff --git a/practice/7.network-abstractions/2.ingress-and-services/app/deployment-with-configmap.yaml b/practice/6.network-abstractions/2.ingress-and-services/app/deployment-with-configmap.yaml similarity index 100% rename from practice/7.network-abstractions/2.ingress-and-services/app/deployment-with-configmap.yaml rename to practice/6.network-abstractions/2.ingress-and-services/app/deployment-with-configmap.yaml diff --git a/practice/7.network-abstractions/2.ingress-and-services/clusterip.yaml b/practice/6.network-abstractions/2.ingress-and-services/clusterip.yaml similarity index 100% rename from practice/7.network-abstractions/2.ingress-and-services/clusterip.yaml rename to practice/6.network-abstractions/2.ingress-and-services/clusterip.yaml diff --git a/practice/7.network-abstractions/2.ingress-and-services/host-ingress.yaml b/practice/6.network-abstractions/2.ingress-and-services/host-ingress.yaml similarity index 100% rename from practice/7.network-abstractions/2.ingress-and-services/host-ingress.yaml rename to practice/6.network-abstractions/2.ingress-and-services/host-ingress.yaml diff --git a/practice/7.network-abstractions/2.ingress-and-services/loadbalancer.yaml b/practice/6.network-abstractions/2.ingress-and-services/loadbalancer.yaml similarity index 100% rename from practice/7.network-abstractions/2.ingress-and-services/loadbalancer.yaml rename to practice/6.network-abstractions/2.ingress-and-services/loadbalancer.yaml diff --git a/practice/7.network-abstractions/2.ingress-and-services/nodeport.yaml b/practice/6.network-abstractions/2.ingress-and-services/nodeport.yaml similarity index 100% rename from practice/7.network-abstractions/2.ingress-and-services/nodeport.yaml rename to practice/6.network-abstractions/2.ingress-and-services/nodeport.yaml diff --git a/practice/9.local-development/README.md b/practice/8.local-development/README.md similarity index 94% rename from practice/9.local-development/README.md rename to practice/8.local-development/README.md index 21cdc66..0ea2567 100644 --- a/practice/9.local-development/README.md +++ b/practice/8.local-development/README.md @@ -4,7 +4,7 @@ В среде Windows, рекомендуем выполнять команды в [Git Bash](https://git-scm.com/downloads) -[Описание и решение](https://github.com/Slurmio/school-dev-k8s/blob/main/practice/9.local-development/problems_window.md) возможных проблем на платформе Windows. +[Описание и решение](https://github.com/Slurmio/school-dev-k8s/blob/main/practice/8.local-development/problems_window.md) возможных проблем на платформе Windows. ## 1. Запускаем minikube @@ -42,7 +42,7 @@ eval $(minikube docker-env) Дальше билдим образ -> ВАЖНО!!! нужно находиться в директории `~/school-dev-k8s/practice/9.local-development/app/` +> ВАЖНО!!! нужно находиться в директории `~/school-dev-k8s/practice/8.local-development/app/` ```bash docker build . -t myapp:dev @@ -51,7 +51,7 @@ docker build . -t myapp:dev После этого В ОТДЕЛЬНОЙ КОНСОЛИ запускаем команду для монтирования локальной директории в minikube. -> ВАЖНО!!! нужно находиться в директории `~/school-dev-k8s/practice/9.local-development/app/` +> ВАЖНО!!! нужно находиться в директории `~/school-dev-k8s/practice/8.local-development/app/` ```bash minikube mount .:/app diff --git a/practice/9.local-development/app/Dockerfile b/practice/8.local-development/app/Dockerfile similarity index 100% rename from practice/9.local-development/app/Dockerfile rename to practice/8.local-development/app/Dockerfile diff --git a/practice/9.local-development/app/app.py b/practice/8.local-development/app/app.py similarity index 100% rename from practice/9.local-development/app/app.py rename to practice/8.local-development/app/app.py diff --git a/practice/9.local-development/app/kube/deployment.yaml b/practice/8.local-development/app/kube/deployment.yaml similarity index 100% rename from practice/9.local-development/app/kube/deployment.yaml rename to practice/8.local-development/app/kube/deployment.yaml diff --git a/practice/9.local-development/app/kube/service.yaml b/practice/8.local-development/app/kube/service.yaml similarity index 100% rename from practice/9.local-development/app/kube/service.yaml rename to practice/8.local-development/app/kube/service.yaml diff --git a/practice/9.local-development/app/requirements.txt b/practice/8.local-development/app/requirements.txt similarity index 100% rename from practice/9.local-development/app/requirements.txt rename to practice/8.local-development/app/requirements.txt diff --git a/practice/9.local-development/problems_window.md b/practice/8.local-development/problems_window.md similarity index 100% rename from practice/9.local-development/problems_window.md rename to practice/8.local-development/problems_window.md diff --git a/practice/10.oneshot-tasks/1.job/README.md b/practice/9.oneshot-tasks/1.job/README.md similarity index 94% rename from practice/10.oneshot-tasks/1.job/README.md rename to practice/9.oneshot-tasks/1.job/README.md index 77c899b..4909ece 100644 --- a/practice/10.oneshot-tasks/1.job/README.md +++ b/practice/9.oneshot-tasks/1.job/README.md @@ -5,7 +5,7 @@ 1) Создаем job ```bash -kubectl apply -f ~/school-dev-k8s/practice/10.oneshot-tasks/1.job/job.yaml +kubectl apply -f ~/school-dev-k8s/practice/9.oneshot-tasks/1.job/job.yaml ``` 2) Проверяем @@ -76,7 +76,7 @@ args: 7) Создаем Job: ```bash -kubectl apply -f ~/school-dev-k8s/practice/10.oneshot-tasks/1.job/job.yaml +kubectl apply -f ~/school-dev-k8s/practice/9.oneshot-tasks/1.job/job.yaml ``` 8) Проверяем @@ -150,7 +150,7 @@ args: 13) Создаем Job ```bash -kubectl apply -f ~/school-dev-k8s/practice/10.oneshot-tasks/1.job/job.yaml +kubectl apply -f ~/school-dev-k8s/practice/9.oneshot-tasks/1.job/job.yaml ``` 14) Проверяем diff --git a/practice/10.oneshot-tasks/1.job/job.yaml b/practice/9.oneshot-tasks/1.job/job.yaml similarity index 100% rename from practice/10.oneshot-tasks/1.job/job.yaml rename to practice/9.oneshot-tasks/1.job/job.yaml diff --git a/practice/10.oneshot-tasks/2.cronjob/README.md b/practice/9.oneshot-tasks/2.cronjob/README.md similarity index 86% rename from practice/10.oneshot-tasks/2.cronjob/README.md rename to practice/9.oneshot-tasks/2.cronjob/README.md index 0dec7be..05fc850 100644 --- a/practice/10.oneshot-tasks/2.cronjob/README.md +++ b/practice/9.oneshot-tasks/2.cronjob/README.md @@ -3,7 +3,7 @@ 1) Создаем CronJob: ```bash -kubectl apply -f ~/school-dev-k8s/practice/10.oneshot-tasks/2.cronjob/cronjob.yaml +kubectl apply -f ~/school-dev-k8s/practice/9.oneshot-tasks/2.cronjob/cronjob.yaml ``` 2) Проверяем @@ -54,5 +54,5 @@ kubectl get job,pod 6) Удаляем CronJob ```bash -kubectl delete -f ~/school-dev-k8s/practice/10.oneshot-tasks/2.cronjob/cronjob.yaml +kubectl delete -f ~/school-dev-k8s/practice/9.oneshot-tasks/2.cronjob/cronjob.yaml ``` diff --git a/practice/10.oneshot-tasks/2.cronjob/cronjob.yaml b/practice/9.oneshot-tasks/2.cronjob/cronjob.yaml similarity index 100% rename from practice/10.oneshot-tasks/2.cronjob/cronjob.yaml rename to practice/9.oneshot-tasks/2.cronjob/cronjob.yaml