diff --git a/README.md b/README.md index 9b97e81d..16d09e03 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ -# Kubernetes Examples: releases.k8s.io/HEAD +# Kubernetes Examples -This directory contains a number of examples of how to run -real applications with Kubernetes. - -Demonstrations of how to use specific Kubernetes features can be found in our [documents](../docs/). +This directory contains a number of examples of how to run real applications +with Kubernetes. +Refer to the [Kubernetes documentation] for how to execute the tutorials. ### Maintained Examples -Maintained Examples are expected to be updated with every Kubernetes -release, to use the latest and greatest features, current guidelines -and best practices, and to refresh command syntax, output, changed -prerequisites, as needed. +Maintained Examples are expected to be updated with every Kubernetes release, to +use the latest and greatest features, current guidelines and best practices, +and to refresh command syntax, output, changed prerequisites, as needed. |Name | Description | Notable Features Used | Complexity Level| ------------- | ------------- | ------------ | ------------ | -|[Guestbook](guestbook/) | PHP app with Redis | Replication Controller, Service | Beginner | +|[Guestbook](guestbook/) | PHP app with Redis | Deployment, Service | Beginner | |[WordPress](mysql-wordpress-pd/) | WordPress with MySQL | Deployment, Persistent Volume with Claim | Beginner| -|[Cassandra](storage/cassandra/) | Cloud Native Cassandra | Daemon Set | Intermediate +|[Cassandra](storage/cassandra/) | Cloud Native Cassandra | Daemon Set, Stateful Set, Replication Controller | Intermediate -* Note: Please add examples to the list above that are maintained. +> Note: Please add examples that are maintained to the list above. See [Example Guidelines](guidelines.md) for a description of what goes in this directory, and what examples should contain. + +[Kubernetes documentation]: https://kubernetes.io/docs/tutorials/ diff --git a/staging/storage/cassandra/README.md b/cassandra/README.md similarity index 100% rename from staging/storage/cassandra/README.md rename to cassandra/README.md diff --git a/staging/storage/cassandra/cassandra-controller.yaml b/cassandra/cassandra-controller.yaml similarity index 100% rename from staging/storage/cassandra/cassandra-controller.yaml rename to cassandra/cassandra-controller.yaml diff --git a/staging/storage/cassandra/cassandra-daemonset.yaml b/cassandra/cassandra-daemonset.yaml similarity index 100% rename from staging/storage/cassandra/cassandra-daemonset.yaml rename to cassandra/cassandra-daemonset.yaml diff --git a/staging/storage/cassandra/cassandra-service.yaml b/cassandra/cassandra-service.yaml similarity index 100% rename from staging/storage/cassandra/cassandra-service.yaml rename to cassandra/cassandra-service.yaml diff --git a/staging/storage/cassandra/cassandra-statefulset.yaml b/cassandra/cassandra-statefulset.yaml similarity index 100% rename from staging/storage/cassandra/cassandra-statefulset.yaml rename to cassandra/cassandra-statefulset.yaml diff --git a/staging/storage/cassandra/image/Dockerfile b/cassandra/image/Dockerfile similarity index 100% rename from staging/storage/cassandra/image/Dockerfile rename to cassandra/image/Dockerfile diff --git a/staging/storage/cassandra/image/Makefile b/cassandra/image/Makefile similarity index 100% rename from staging/storage/cassandra/image/Makefile rename to cassandra/image/Makefile diff --git a/staging/storage/cassandra/image/files/cassandra.yaml b/cassandra/image/files/cassandra.yaml similarity index 100% rename from staging/storage/cassandra/image/files/cassandra.yaml rename to cassandra/image/files/cassandra.yaml diff --git a/staging/storage/cassandra/image/files/jvm.options b/cassandra/image/files/jvm.options similarity index 100% rename from staging/storage/cassandra/image/files/jvm.options rename to cassandra/image/files/jvm.options diff --git a/staging/storage/cassandra/image/files/kubernetes-cassandra.jar b/cassandra/image/files/kubernetes-cassandra.jar similarity index 100% rename from staging/storage/cassandra/image/files/kubernetes-cassandra.jar rename to cassandra/image/files/kubernetes-cassandra.jar diff --git a/staging/storage/cassandra/image/files/logback.xml b/cassandra/image/files/logback.xml similarity index 100% rename from staging/storage/cassandra/image/files/logback.xml rename to cassandra/image/files/logback.xml diff --git a/staging/storage/cassandra/image/files/ready-probe.sh b/cassandra/image/files/ready-probe.sh similarity index 100% rename from staging/storage/cassandra/image/files/ready-probe.sh rename to cassandra/image/files/ready-probe.sh diff --git a/staging/storage/cassandra/image/files/run.sh b/cassandra/image/files/run.sh similarity index 100% rename from staging/storage/cassandra/image/files/run.sh rename to cassandra/image/files/run.sh diff --git a/staging/storage/cassandra/java/.gitignore b/cassandra/java/.gitignore similarity index 100% rename from staging/storage/cassandra/java/.gitignore rename to cassandra/java/.gitignore diff --git a/staging/storage/cassandra/java/README.md b/cassandra/java/README.md similarity index 100% rename from staging/storage/cassandra/java/README.md rename to cassandra/java/README.md diff --git a/staging/storage/cassandra/java/pom.xml b/cassandra/java/pom.xml similarity index 100% rename from staging/storage/cassandra/java/pom.xml rename to cassandra/java/pom.xml diff --git a/staging/storage/cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java b/cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java similarity index 100% rename from staging/storage/cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java rename to cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java diff --git a/staging/storage/cassandra/java/src/test/java/io/k8s/cassandra/KubernetesSeedProviderTest.java b/cassandra/java/src/test/java/io/k8s/cassandra/KubernetesSeedProviderTest.java similarity index 100% rename from staging/storage/cassandra/java/src/test/java/io/k8s/cassandra/KubernetesSeedProviderTest.java rename to cassandra/java/src/test/java/io/k8s/cassandra/KubernetesSeedProviderTest.java diff --git a/staging/storage/cassandra/java/src/test/resources/cassandra.yaml b/cassandra/java/src/test/resources/cassandra.yaml similarity index 100% rename from staging/storage/cassandra/java/src/test/resources/cassandra.yaml rename to cassandra/java/src/test/resources/cassandra.yaml diff --git a/staging/storage/cassandra/java/src/test/resources/logback-test.xml b/cassandra/java/src/test/resources/logback-test.xml similarity index 100% rename from staging/storage/cassandra/java/src/test/resources/logback-test.xml rename to cassandra/java/src/test/resources/logback-test.xml diff --git a/staging/guestbook-go/.gitignore b/guestbook-go/.gitignore similarity index 100% rename from staging/guestbook-go/.gitignore rename to guestbook-go/.gitignore diff --git a/staging/guestbook-go/BUILD b/guestbook-go/BUILD similarity index 100% rename from staging/guestbook-go/BUILD rename to guestbook-go/BUILD diff --git a/staging/guestbook-go/Dockerfile b/guestbook-go/Dockerfile similarity index 100% rename from staging/guestbook-go/Dockerfile rename to guestbook-go/Dockerfile diff --git a/staging/guestbook-go/Makefile b/guestbook-go/Makefile similarity index 100% rename from staging/guestbook-go/Makefile rename to guestbook-go/Makefile diff --git a/staging/guestbook-go/README.md b/guestbook-go/README.md similarity index 100% rename from staging/guestbook-go/README.md rename to guestbook-go/README.md diff --git a/staging/guestbook-go/guestbook-controller.json b/guestbook-go/guestbook-controller.json similarity index 100% rename from staging/guestbook-go/guestbook-controller.json rename to guestbook-go/guestbook-controller.json diff --git a/staging/guestbook-go/guestbook-page.png b/guestbook-go/guestbook-page.png similarity index 100% rename from staging/guestbook-go/guestbook-page.png rename to guestbook-go/guestbook-page.png diff --git a/staging/guestbook-go/guestbook-service.json b/guestbook-go/guestbook-service.json similarity index 100% rename from staging/guestbook-go/guestbook-service.json rename to guestbook-go/guestbook-service.json diff --git a/staging/guestbook-go/main.go b/guestbook-go/main.go similarity index 100% rename from staging/guestbook-go/main.go rename to guestbook-go/main.go diff --git a/staging/guestbook-go/public/index.html b/guestbook-go/public/index.html similarity index 100% rename from staging/guestbook-go/public/index.html rename to guestbook-go/public/index.html diff --git a/staging/guestbook-go/public/script.js b/guestbook-go/public/script.js similarity index 100% rename from staging/guestbook-go/public/script.js rename to guestbook-go/public/script.js diff --git a/staging/guestbook-go/public/style.css b/guestbook-go/public/style.css similarity index 100% rename from staging/guestbook-go/public/style.css rename to guestbook-go/public/style.css diff --git a/staging/guestbook-go/redis-master-controller.json b/guestbook-go/redis-master-controller.json similarity index 100% rename from staging/guestbook-go/redis-master-controller.json rename to guestbook-go/redis-master-controller.json diff --git a/staging/guestbook-go/redis-master-service.json b/guestbook-go/redis-master-service.json similarity index 100% rename from staging/guestbook-go/redis-master-service.json rename to guestbook-go/redis-master-service.json diff --git a/staging/guestbook-go/redis-slave-controller.json b/guestbook-go/redis-slave-controller.json similarity index 100% rename from staging/guestbook-go/redis-slave-controller.json rename to guestbook-go/redis-slave-controller.json diff --git a/staging/guestbook-go/redis-slave-service.json b/guestbook-go/redis-slave-service.json similarity index 100% rename from staging/guestbook-go/redis-slave-service.json rename to guestbook-go/redis-slave-service.json diff --git a/staging/guestbook/README.md b/guestbook/README.md similarity index 100% rename from staging/guestbook/README.md rename to guestbook/README.md diff --git a/staging/guestbook/all-in-one/frontend.yaml b/guestbook/all-in-one/frontend.yaml similarity index 100% rename from staging/guestbook/all-in-one/frontend.yaml rename to guestbook/all-in-one/frontend.yaml diff --git a/staging/guestbook/all-in-one/guestbook-all-in-one.yaml b/guestbook/all-in-one/guestbook-all-in-one.yaml similarity index 100% rename from staging/guestbook/all-in-one/guestbook-all-in-one.yaml rename to guestbook/all-in-one/guestbook-all-in-one.yaml diff --git a/staging/guestbook/all-in-one/redis-slave.yaml b/guestbook/all-in-one/redis-slave.yaml similarity index 100% rename from staging/guestbook/all-in-one/redis-slave.yaml rename to guestbook/all-in-one/redis-slave.yaml diff --git a/staging/guestbook/frontend-deployment.yaml b/guestbook/frontend-deployment.yaml similarity index 100% rename from staging/guestbook/frontend-deployment.yaml rename to guestbook/frontend-deployment.yaml diff --git a/staging/guestbook/frontend-service.yaml b/guestbook/frontend-service.yaml similarity index 100% rename from staging/guestbook/frontend-service.yaml rename to guestbook/frontend-service.yaml diff --git a/staging/guestbook/legacy/frontend-controller.yaml b/guestbook/legacy/frontend-controller.yaml similarity index 100% rename from staging/guestbook/legacy/frontend-controller.yaml rename to guestbook/legacy/frontend-controller.yaml diff --git a/staging/guestbook/legacy/redis-master-controller.yaml b/guestbook/legacy/redis-master-controller.yaml similarity index 100% rename from staging/guestbook/legacy/redis-master-controller.yaml rename to guestbook/legacy/redis-master-controller.yaml diff --git a/staging/guestbook/legacy/redis-slave-controller.yaml b/guestbook/legacy/redis-slave-controller.yaml similarity index 100% rename from staging/guestbook/legacy/redis-slave-controller.yaml rename to guestbook/legacy/redis-slave-controller.yaml diff --git a/staging/guestbook/php-redis/Dockerfile b/guestbook/php-redis/Dockerfile similarity index 100% rename from staging/guestbook/php-redis/Dockerfile rename to guestbook/php-redis/Dockerfile diff --git a/staging/guestbook/php-redis/controllers.js b/guestbook/php-redis/controllers.js similarity index 100% rename from staging/guestbook/php-redis/controllers.js rename to guestbook/php-redis/controllers.js diff --git a/staging/guestbook/php-redis/guestbook.php b/guestbook/php-redis/guestbook.php similarity index 100% rename from staging/guestbook/php-redis/guestbook.php rename to guestbook/php-redis/guestbook.php diff --git a/staging/guestbook/php-redis/index.html b/guestbook/php-redis/index.html similarity index 100% rename from staging/guestbook/php-redis/index.html rename to guestbook/php-redis/index.html diff --git a/staging/guestbook/redis-master-deployment.yaml b/guestbook/redis-master-deployment.yaml similarity index 100% rename from staging/guestbook/redis-master-deployment.yaml rename to guestbook/redis-master-deployment.yaml diff --git a/staging/guestbook/redis-master-service.yaml b/guestbook/redis-master-service.yaml similarity index 100% rename from staging/guestbook/redis-master-service.yaml rename to guestbook/redis-master-service.yaml diff --git a/staging/guestbook/redis-slave-deployment.yaml b/guestbook/redis-slave-deployment.yaml similarity index 100% rename from staging/guestbook/redis-slave-deployment.yaml rename to guestbook/redis-slave-deployment.yaml diff --git a/staging/guestbook/redis-slave-service.yaml b/guestbook/redis-slave-service.yaml similarity index 100% rename from staging/guestbook/redis-slave-service.yaml rename to guestbook/redis-slave-service.yaml diff --git a/staging/guestbook/redis-slave/Dockerfile b/guestbook/redis-slave/Dockerfile similarity index 100% rename from staging/guestbook/redis-slave/Dockerfile rename to guestbook/redis-slave/Dockerfile diff --git a/staging/guestbook/redis-slave/run.sh b/guestbook/redis-slave/run.sh similarity index 100% rename from staging/guestbook/redis-slave/run.sh rename to guestbook/redis-slave/run.sh diff --git a/staging/guidelines.md b/guidelines.md similarity index 100% rename from staging/guidelines.md rename to guidelines.md diff --git a/staging/mysql-wordpress-pd/OWNERS b/mysql-wordpress-pd/OWNERS similarity index 100% rename from staging/mysql-wordpress-pd/OWNERS rename to mysql-wordpress-pd/OWNERS diff --git a/staging/mysql-wordpress-pd/README.md b/mysql-wordpress-pd/README.md similarity index 100% rename from staging/mysql-wordpress-pd/README.md rename to mysql-wordpress-pd/README.md diff --git a/staging/mysql-wordpress-pd/WordPress.png b/mysql-wordpress-pd/WordPress.png similarity index 100% rename from staging/mysql-wordpress-pd/WordPress.png rename to mysql-wordpress-pd/WordPress.png diff --git a/staging/mysql-wordpress-pd/gce-volumes.yaml b/mysql-wordpress-pd/gce-volumes.yaml similarity index 100% rename from staging/mysql-wordpress-pd/gce-volumes.yaml rename to mysql-wordpress-pd/gce-volumes.yaml diff --git a/staging/mysql-wordpress-pd/local-volumes.yaml b/mysql-wordpress-pd/local-volumes.yaml similarity index 100% rename from staging/mysql-wordpress-pd/local-volumes.yaml rename to mysql-wordpress-pd/local-volumes.yaml diff --git a/staging/mysql-wordpress-pd/mysql-deployment.yaml b/mysql-wordpress-pd/mysql-deployment.yaml similarity index 100% rename from staging/mysql-wordpress-pd/mysql-deployment.yaml rename to mysql-wordpress-pd/mysql-deployment.yaml diff --git a/staging/mysql-wordpress-pd/wordpress-deployment.yaml b/mysql-wordpress-pd/wordpress-deployment.yaml similarity index 100% rename from staging/mysql-wordpress-pd/wordpress-deployment.yaml rename to mysql-wordpress-pd/wordpress-deployment.yaml