Examples/tests use ClusterIP by default for the viking public Service.

The helm charts already do this, it is a change for the kubectl/yaml
examples, which have been using NodePort. NodePort has been
unnecessary since we've automated testing by using port-forward to
the Service. This brings the two different deployment methods more
in line.

We will add tests for LoadBalancer and NodePort Services.

The docs are now even more out of sync with the actual example/test
code, since they still reference the NodePort type.

deploy/Makefile

@@ -120,7 +120,7 @@ deploy-service-kubectl:
 	@kubectl apply -f adm-secret.yaml
 	@kubectl apply -f varnish.yaml
 	@kubectl apply -f admin-svc.yaml
-	@kubectl apply -f nodeport.yaml
+	@kubectl apply -f service.yaml
 
 deploy-service:
 
@@ -143,7 +143,7 @@ undeploy-service-helm:
 undeploy-service-kubectl:
 	@kubectl delete -f rbac-varnish.yaml
 	@kubectl delete -f serviceaccount-varnish.yaml
-	@kubectl delete -f nodeport.yaml
+	@kubectl delete -f service.yaml
 	@kubectl delete -f admin-svc.yaml
 	@kubectl delete -f varnish.yaml
 	@kubectl delete -f adm-secret.yaml

deploy/nodeport.yaml → deploy/service.yaml

@@ -6,7 +6,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort
   ports:
   - port: 80
     targetPort: 8888

examples/architectures/cluster-and-ns-wide/Makefile

@@ -104,11 +104,11 @@ deploy-kubectl:
 	@kubectl apply -f other.yaml
 	@kubectl apply -f adm-secret-system.yaml
 	@kubectl apply -f admin-svc-system.yaml
-	@kubectl apply -f nodeport-system.yaml
+	@kubectl apply -f service-system.yaml
 	@kubectl apply -f varnish-system.yaml
 	@kubectl apply -f adm-secret-coffee.yaml
 	@kubectl apply -f admin-svc-coffee.yaml
-	@kubectl apply -f nodeport-coffee.yaml
+	@kubectl apply -f service-coffee.yaml
 	@kubectl apply -f varnish-coffee.yaml
 	@kubectl apply -f coffee-ingress.yaml
 	@kubectl apply -f tea-ingress.yaml
@@ -139,11 +139,11 @@ undeploy-kubectl:
 	@kubectl delete -f tea-ingress.yaml
 	@kubectl delete -f coffee-ingress.yaml
 	@kubectl delete -f varnish-coffee.yaml
-	@kubectl delete -f nodeport-coffee.yaml
+	@kubectl delete -f service-coffee.yaml
 	@kubectl delete -f admin-svc-coffee.yaml
 	@kubectl delete -f adm-secret-coffee.yaml
 	@kubectl delete -f varnish-system.yaml
-	@kubectl delete -f nodeport-system.yaml
+	@kubectl delete -f service-system.yaml
 	@kubectl delete -f admin-svc-system.yaml
 	@kubectl delete -f adm-secret-system.yaml
 	@kubectl delete -f other.yaml

examples/architectures/cluster-and-ns-wide/nodeport-coffee.yaml → examples/architectures/cluster-and-ns-wide/service-coffee.yaml

@@ -7,7 +7,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort 
   ports:
   - port: 80
     targetPort: 8888

examples/architectures/clusterwide/nodeport.yaml → examples/architectures/cluster-and-ns-wide/service-system.yaml

@@ -7,7 +7,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort 
   ports:
   - port: 80
     targetPort: 8888

examples/architectures/clusterwide/Makefile

@@ -96,7 +96,7 @@ deploy-kubectl:
 	@kubectl apply -f other.yaml
 	@kubectl apply -f adm-secret.yaml
 	@kubectl apply -f admin-svc.yaml
-	@kubectl apply -f nodeport.yaml
+	@kubectl apply -f service.yaml
 	@kubectl apply -f varnish.yaml
 	@kubectl apply -f coffee-ingress.yaml
 	@kubectl apply -f tea-ingress.yaml
@@ -126,7 +126,7 @@ undeploy-kubectl:
 	@kubectl delete -f tea-ingress.yaml
 	@kubectl delete -f coffee-ingress.yaml
 	@kubectl delete -f varnish.yaml
-	@kubectl delete -f nodeport.yaml
+	@kubectl delete -f service.yaml
 	@kubectl delete -f admin-svc.yaml
 	@kubectl delete -f adm-secret.yaml
 	@kubectl delete -f other.yaml

examples/architectures/cluster-and-ns-wide/nodeport-system.yaml → examples/architectures/clusterwide/service.yaml

@@ -7,7 +7,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort 
   ports:
   - port: 80
     targetPort: 8888

examples/architectures/multi-controller/Makefile

@@ -121,11 +121,11 @@ deploy-kubectl:
 	@kubectl apply -f tea.yaml
 	@kubectl apply -f adm-secret-tea.yaml
 	@kubectl apply -f admin-svc-tea.yaml
-	@kubectl apply -f nodeport-tea.yaml
+	@kubectl apply -f service-tea.yaml
 	@kubectl apply -f varnish-tea.yaml
 	@kubectl apply -f adm-secret-coffee.yaml
 	@kubectl apply -f admin-svc-coffee.yaml
-	@kubectl apply -f nodeport-coffee.yaml
+	@kubectl apply -f service-coffee.yaml
 	@kubectl apply -f varnish-coffee.yaml
 	@kubectl apply -f coffee-ingress.yaml
 	@kubectl apply -f tea-ingress.yaml
@@ -156,11 +156,11 @@ undeploy-kubectl:
 	@kubectl delete -f tea-ingress.yaml
 	@kubectl delete -f coffee-ingress.yaml
 	@kubectl delete -f varnish-coffee.yaml
-	@kubectl delete -f nodeport-coffee.yaml
+	@kubectl delete -f service-coffee.yaml
 	@kubectl delete -f admin-svc-coffee.yaml
 	@kubectl delete -f adm-secret-coffee.yaml
 	@kubectl delete -f varnish-tea.yaml
-	@kubectl delete -f nodeport-tea.yaml
+	@kubectl delete -f service-tea.yaml
 	@kubectl delete -f admin-svc-tea.yaml
 	@kubectl delete -f adm-secret-tea.yaml
 	@kubectl delete -f tea.yaml

examples/architectures/multi-controller/nodeport-coffee.yaml → examples/architectures/multi-controller/service-coffee.yaml

@@ -7,7 +7,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort 
   ports:
   - port: 80
     targetPort: 8888

examples/architectures/multi-varnish-ns/nodeport-tea.yaml → examples/architectures/multi-controller/service-tea.yaml

@@ -7,7 +7,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort 
   ports:
   - port: 80
     targetPort: 8888

examples/architectures/multi-varnish-ns/Makefile

@@ -105,11 +105,11 @@ deploy-kubectl:
 	@kubectl apply -f tea.yaml
 	@kubectl apply -f adm-secret-tea.yaml
 	@kubectl apply -f admin-svc-tea.yaml
-	@kubectl apply -f nodeport-tea.yaml
+	@kubectl apply -f service-tea.yaml
 	@kubectl apply -f varnish-tea.yaml
 	@kubectl apply -f adm-secret-coffee.yaml
 	@kubectl apply -f admin-svc-coffee.yaml
-	@kubectl apply -f nodeport-coffee.yaml
+	@kubectl apply -f service-coffee.yaml
 	@kubectl apply -f varnish-coffee.yaml
 	@kubectl apply -f coffee-ingress.yaml
 	@kubectl apply -f tea-ingress.yaml
@@ -137,11 +137,11 @@ undeploy-kubectl:
 	@kubectl delete -f tea-ingress.yaml
 	@kubectl delete -f coffee-ingress.yaml
 	@kubectl delete -f varnish-coffee.yaml
-	@kubectl delete -f nodeport-coffee.yaml
+	@kubectl delete -f service-coffee.yaml
 	@kubectl delete -f admin-svc-coffee.yaml
 	@kubectl delete -f adm-secret-coffee.yaml
 	@kubectl delete -f varnish-tea.yaml
-	@kubectl delete -f nodeport-tea.yaml
+	@kubectl delete -f service-tea.yaml
 	@kubectl delete -f admin-svc-tea.yaml
 	@kubectl delete -f adm-secret-tea.yaml
 	@kubectl delete -f tea.yaml

examples/architectures/multi-varnish-ns/nodeport-coffee.yaml → examples/architectures/multi-varnish-ns/service-coffee.yaml

@@ -7,7 +7,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort 
   ports:
   - port: 80
     targetPort: 8888

examples/architectures/multi-controller/nodeport-tea.yaml → examples/architectures/multi-varnish-ns/service-tea.yaml

@@ -7,7 +7,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort 
   ports:
   - port: 80
     targetPort: 8888

examples/file-cache/varnish.yaml

@@ -6,7 +6,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort
   ports:
   - port: 80
     targetPort: 8888

examples/namespace/Makefile

@@ -105,7 +105,7 @@ deploy-kubectl:
 	@kubectl apply -f adm-secret.yaml
 	@kubectl apply -f varnish.yaml
 	@kubectl apply -f admin-svc.yaml
-	@kubectl apply -f nodeport.yaml
+	@kubectl apply -f service.yaml
 	@kubectl apply -f controller.yaml
 	@kubectl apply -f cafe.yaml
 	@kubectl apply -f cafe-ingress.yaml
@@ -132,7 +132,7 @@ undeploy-kubectl:
 	@kubectl delete -f cafe-ingress.yaml
 	@kubectl delete -f cafe.yaml
 	@kubectl delete -f controller.yaml
-	@kubectl delete -f nodeport.yaml
+	@kubectl delete -f service.yaml
 	@kubectl delete -f admin-svc.yaml
 	@kubectl delete -f varnish.yaml
 	@kubectl delete -f adm-secret.yaml

examples/namespace/nodeport.yaml → examples/namespace/service.yaml

@@ -7,7 +7,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort 
   ports:
   - port: 80
     targetPort: 8888

examples/varnish_pod_template/cli-args.yaml

@@ -6,7 +6,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort
   ports:
   - port: 80
     targetPort: 8888

examples/varnish_pod_template/env.yaml

@@ -6,7 +6,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort
   ports:
   - port: 81
     targetPort: 81

examples/varnish_pod_template/nonroot.yaml

@@ -6,7 +6,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort
   ports:
   - port: 80
     targetPort: 8888

examples/varnish_pod_template/proxy.yaml

@@ -6,7 +6,6 @@ metadata:
     app: varnish-ingress
     viking.uplex.de/svc: public
 spec:
-  type: NodePort
   ports:
   - port: 80
     targetPort: 8888