diff --git a/docs/evaluation.md b/docs/evaluation.md index 1af7a211..4be3042c 100644 --- a/docs/evaluation.md +++ b/docs/evaluation.md @@ -25,22 +25,26 @@ To perform a quick test of the webhosting-operator, create some example `Website $ kubectl apply -k webhosting-operator/config/samples ... -$ kubectl -n project-foo get website,deploy,svc,ing -L shard.alpha.sharding.timebertt.dev/webhosting-operator -NAME THEME PHASE SINCE AGE WEBHOSTING-OPERATOR -website.webhosting.timebertt.dev/homepage exciting Ready 6s 16s webhosting-operator-98ff76b66-tdrtc -website.webhosting.timebertt.dev/official lame Ready 5s 16s webhosting-operator-98ff76b66-tdrtc - -NAME READY UP-TO-DATE AVAILABLE AGE WEBHOSTING-OPERATOR -deployment.apps/homepage-98bad4 1/1 1 1 15s webhosting-operator-98ff76b66-tdrtc -deployment.apps/official-10ff22 1/1 1 1 15s webhosting-operator-98ff76b66-tdrtc - -NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE WEBHOSTING-OPERATOR -service/homepage-98bad4 ClusterIP 100.82.128.107 8080/TCP 16s webhosting-operator-98ff76b66-tdrtc -service/official-10ff22 ClusterIP 100.82.194.21 8080/TCP 16s webhosting-operator-98ff76b66-tdrtc - -NAME CLASS HOSTS ADDRESS PORTS AGE WEBHOSTING-OPERATOR -ingress.networking.k8s.io/homepage-98bad4 nginx webhosting.timebertt.dev 80, 443 16s webhosting-operator-98ff76b66-tdrtc -ingress.networking.k8s.io/official-10ff22 nginx webhosting.timebertt.dev 80, 443 15s webhosting-operator-98ff76b66-tdrtc +$ kubectl -n project-foo get website,deploy,ing,svc,cm -L shard.alpha.sharding.timebertt.dev/webhosting-operator +NAME THEME PHASE SINCE AGE WEBHOSTING-OPERATOR +website.webhosting.timebertt.dev/kubecon exciting Ready 1s 3s webhosting-operator-5f7854768d-8n59m +website.webhosting.timebertt.dev/library lame Ready 1s 3s webhosting-operator-5f7854768d-j67tj + +NAME READY UP-TO-DATE AVAILABLE AGE WEBHOSTING-OPERATOR +deployment.apps/kubecon-b5ed55 1/1 1 1 3s webhosting-operator-5f7854768d-8n59m +deployment.apps/library-185298 1/1 1 1 3s webhosting-operator-5f7854768d-j67tj + +NAME CLASS HOSTS ADDRESS PORTS AGE WEBHOSTING-OPERATOR +ingress.networking.k8s.io/kubecon-b5ed55 nginx webhosting.timebertt.dev 80, 443 3s webhosting-operator-5f7854768d-8n59m +ingress.networking.k8s.io/library-185298 nginx webhosting.timebertt.dev 80, 443 3s webhosting-operator-5f7854768d-j67tj + +NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE WEBHOSTING-OPERATOR +service/kubecon-b5ed55 ClusterIP 100.82.167.176 8080/TCP 3s webhosting-operator-5f7854768d-8n59m +service/library-185298 ClusterIP 100.82.224.52 8080/TCP 3s webhosting-operator-5f7854768d-j67tj + +NAME DATA AGE WEBHOSTING-OPERATOR +configmap/kubecon-b5ed55 2 3s webhosting-operator-5f7854768d-8n59m +configmap/library-185298 2 3s webhosting-operator-5f7854768d-j67tj ``` You can now visit the created websites at http://localhost:8088/project-foo/homepage and http://localhost:8088/project-foo/official. diff --git a/webhosting-operator/cmd/samples-generator/main.go b/webhosting-operator/cmd/samples-generator/main.go index 75ce069a..5ac713c3 100644 --- a/webhosting-operator/cmd/samples-generator/main.go +++ b/webhosting-operator/cmd/samples-generator/main.go @@ -116,7 +116,7 @@ func generateSamples(ctx context.Context, c client.Client) error { Name: "sample-" + utils.RandomName(8), Namespace: project, Labels: map[string]string{ - "generated-by": "sample-generator", + "generated-by": "samples-generator", }, }, Spec: webhostingv1alpha1.WebsiteSpec{ diff --git a/webhosting-operator/config/samples/kustomization.yaml b/webhosting-operator/config/samples/kustomization.yaml index 7d5fb9e9..60cdde8e 100644 --- a/webhosting-operator/config/samples/kustomization.yaml +++ b/webhosting-operator/config/samples/kustomization.yaml @@ -5,5 +5,5 @@ resources: - project_namespace.yaml - theme_exciting.yaml - theme_lame.yaml -- website_homepage.yaml -- website_official.yaml +- website_kubecon.yaml +- website_library.yaml diff --git a/webhosting-operator/config/samples/theme_exciting.yaml b/webhosting-operator/config/samples/theme_exciting.yaml index 8b3f3cb7..99e3ce61 100644 --- a/webhosting-operator/config/samples/theme_exciting.yaml +++ b/webhosting-operator/config/samples/theme_exciting.yaml @@ -4,4 +4,4 @@ metadata: name: exciting spec: color: darkcyan - fontFamily: Menlo + fontFamily: Futura diff --git a/webhosting-operator/config/samples/website_homepage.yaml b/webhosting-operator/config/samples/website_kubecon.yaml similarity index 87% rename from webhosting-operator/config/samples/website_homepage.yaml rename to webhosting-operator/config/samples/website_kubecon.yaml index 2ddb02cb..9794c09c 100644 --- a/webhosting-operator/config/samples/website_homepage.yaml +++ b/webhosting-operator/config/samples/website_kubecon.yaml @@ -1,7 +1,7 @@ apiVersion: webhosting.timebertt.dev/v1alpha1 kind: Website metadata: - name: homepage + name: kubecon namespace: project-foo spec: theme: exciting diff --git a/webhosting-operator/config/samples/website_official.yaml b/webhosting-operator/config/samples/website_library.yaml similarity index 87% rename from webhosting-operator/config/samples/website_official.yaml rename to webhosting-operator/config/samples/website_library.yaml index 7810cf96..c9cf1a3c 100644 --- a/webhosting-operator/config/samples/website_official.yaml +++ b/webhosting-operator/config/samples/website_library.yaml @@ -1,7 +1,7 @@ apiVersion: webhosting.timebertt.dev/v1alpha1 kind: Website metadata: - name: official + name: library namespace: project-foo spec: theme: lame diff --git a/webhosting-operator/config/samples/website_museum.yaml b/webhosting-operator/config/samples/website_museum.yaml new file mode 100644 index 00000000..73ee531b --- /dev/null +++ b/webhosting-operator/config/samples/website_museum.yaml @@ -0,0 +1,7 @@ +apiVersion: webhosting.timebertt.dev/v1alpha1 +kind: Website +metadata: + name: museum + namespace: project-foo +spec: + theme: lame