Improve deployment docs, prep for release v0.9.0

* Update deployment docs to target Fedora CoreOS and Flatcar Linux
* Remove redundant systemd units

CHANGES.md

@@ -4,13 +4,16 @@ Notable changes between releases.
 
 ## Latest
 
+## v0.9.0
+
+* Refresh docs and examples for Fedora CoreOS and Flatcar Linux ([#815](https://github.com/poseidon/matchbox/pull/815), [#816](https://github.com/poseidon/matchbox/pull/816))
+* Update Kubernetes manifest examples ([#791](https://github.com/poseidon/matchbox/pull/791), [#817](https://github.com/poseidon/matchbox/pull/817))
 * Update Matchbox container image publishing ([#795](https://github.com/poseidon/matchbox/pull/795))
   * Publish Matchbox images from internal infra to Quay (`quay.io/poseidon/matchbox`)
   * Update Go version from v1.13.4 to v1.14.9
-* Update base image from `alpine:3.10` to `alpine:3.12` ([#784](https://github.com/poseidon/matchbox/pull/784))
-* Refresh docs and examples for Fedora CoreOS and Flatcar Linux ([#815](https://github.com/poseidon/matchbox/pull/815), [#816](https://github.com/poseidon/matchbox/pull/816))
-* Update Kubernetes manifest examples ([#791](https://github.com/poseidon/matchbox/pull/791))
+  * Update base image from `alpine:3.10` to `alpine:3.12` ([#784](https://github.com/poseidon/matchbox/pull/784))
 * Include `contrib/k8s` in release tarballs ([#788](https://github.com/poseidon/matchbox/pull/788))
+* Remove outdated systemd units ([#817](https://github.com/poseidon/matchbox/pull/817))
 * Remove RPM spec file (Copr publishing stopped in v0.6)
 
 ## v0.8.3

README.md

@@ -18,7 +18,7 @@
 
 Matchbox can be installed from a binary or a container image.
 
-* Install Matchbox on [Kubernetes](docs/deployment.md#kubernetes), on a [Linux](docs/deployment.md) host, or as a [container](docs/deployment.md#docker)
+* Install Matchbox as a [binary](docs/deployment.md#matchbox-binary), as a [container image](docs/deployment.md#container-image), or on [Kubernetes](docs/deployment.md#kubernetes)
 * Setup a PXE-enabled [network](docs/network-setup.md)
 
 ## Tutorials

contrib/k8s/matchbox-deployment.yaml → contrib/k8s/deployment.yaml

@@ -8,17 +8,19 @@ spec:
     rollingUpdate:
       maxUnavailable: 1
   selector:
-      matchLabels:
-        name: matchbox
+    matchLabels:
+      name: matchbox
   template:
     metadata:
       labels:
         name: matchbox
-        phase: prod
     spec:
+      securityContext:
+        seccompProfile:
+          type: RuntimeDefault
       containers:
         - name: matchbox
-          image: quay.io/poseidon/matchbox:v0.8.3
+          image: quay.io/poseidon/matchbox:v0.9.0
           env:
             - name: MATCHBOX_ADDRESS
               value: "0.0.0.0:8080"
@@ -31,20 +33,25 @@ spec:
               containerPort: 8080
             - name: https
               containerPort: 8081
+          livenessProbe:
+            initialDelaySeconds: 5
+            httpGet:
+              path: /
+              port: 8080
           resources:
             requests:
-              cpu: "50m"
-              memory: "50Mi"
+              cpu: 30m
+              memory: 20Mi
+            limits:
+              cpu: 50m
+              memory: 50Mi
           volumeMounts:
             - name: config
               mountPath: /etc/matchbox
             - name: data
               mountPath: /var/lib/matchbox
             - name: assets
               mountPath: /var/lib/matchbox/assets
-      dnsPolicy: ClusterFirst
-      restartPolicy: Always
-      terminationGracePeriodSeconds: 30
       volumes:
         - name: config
           secret:

contrib/k8s/matchbox-ingress.yaml → contrib/k8s/ingress.yaml

@@ -2,15 +2,22 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   name: matchbox
+  annotations:
+    nginx.ingress.kubernetes.io/ssl-redirect: "false"
 spec:
+  ingressClassName: public
+  # tls ... optional
   rules:
     - host: matchbox.example.com
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: matchbox
-              servicePort: 8080
+              service:
+                name: matchbox
+                port:
+                  number: 8080
 ---
 apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
@@ -19,6 +26,7 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/ssl-passthrough: "true"
 spec:
+  ingressClassName: public
   tls:
     - hosts:
         - matchbox-rpc.example.com
@@ -27,6 +35,9 @@ spec:
       http:
         paths:
           - path: /
+            pathType: Prefix
             backend:
-              serviceName: matchbox
-              servicePort: 8081
+              service:
+                name: matchbox
+                port:
+                  number: 8081

contrib/k8s/matchbox-service.yaml → contrib/k8s/service.yaml

@@ -6,7 +6,6 @@ spec:
   type: ClusterIP
   selector:
     name: matchbox
-    phase: prod
   ports:
     - name: http
       protocol: TCP

contrib/systemd/matchbox.service

@@ -1,16 +1,16 @@
 [Unit]
-Description=CoreOS matchbox Server
-Documentation=https://github.com/coreos/matchbox
+Description=Matchbox Server
+Documentation=https://github.com/poseidon/matchbox
 
 [Service]
 User=matchbox
 Group=matchbox
 Environment="MATCHBOX_ADDRESS=0.0.0.0:8080"
-ExecStart=/usr/bin/matchbox
+ExecStart=/usr/local/bin/matchbox
 
 # systemd.exec
 ProtectHome=yes
 ProtectSystem=full
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=multi-user.target