Change password and update to k8s 1.19

Added instructions to run locally with podman

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.5.0
+
+* New image storaxdev/kubedoom:1.0.0
+* New default VNC password is `idbehold`. 
+* Update kubernetes to 1.19.1
+* Update to Ubuntu 20.10
+
 # 0.4.0
 
 * New image storadev/kubedoom:0.4.0

Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /go/src/kubedoom
 ADD kubedoom.go .
 RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o kubedoom .
 
-FROM ubuntu:19.10 AS ubuntu
+FROM ubuntu:20.10 AS ubuntu
 # make sure the package repository is up to date
 RUN apt-get update
 
@@ -46,7 +46,7 @@ RUN apt-get install -y \
 WORKDIR /root/
 
 # Setup a password
-RUN mkdir ~/.vnc && x11vnc -storepasswd 1234 ~/.vnc/passwd
+RUN mkdir ~/.vnc && x11vnc -storepasswd idbehold ~/.vnc/passwd
 
 COPY --from=ubuntu-deps /doom1.wad .
 COPY --from=ubuntu-deps /usr/bin/kubectl /usr/bin/

README.md

@@ -11,19 +11,39 @@ which was forked from psdoom.
 
 ![DOOM](assets/doom.jpg)
 
-## Usage
+## Running Locally
 
-Run `storaxdev/kubedoom:0.4.0` locally:
+In order to run locally you will need to
+
+1. Run the kubedoom container
+2. Attach a VNC client to the appropriate port (5901)
+
+### With Docker
+
+Run `storaxdev/kubedoom:0.5.0` with docker locally:
 
 ```console
 $ docker run -p5901:5900 \
   --net=host \
   -v ~/.kube:/root/.kube \
   --rm -it --name kubedoom \
-  storaxdev/kubedoom:0.4.0
+  storaxdev/kubedoom:0.5.0
 ```
 
-Now start a VNC viewer and connect to `localhost:5901`. The password is `1234`:
+### With Podman
+
+Run `storaxdev/kubedoom:0.5.0` with podman locally:
+
+```console
+$ podman run -it -p5901:5900/tcp \
+  -v ~/.kube:/tmp/.kube --security-opt label=disable \
+  --env "KUBECONFIG=/tmp/.kube/config" --name kubedoom
+  storaxdev/kubedoom:0.5.0
+```
+
+### Attaching a VNC Client
+
+Now start a VNC viewer and connect to `localhost:5901`. The password is `idbehold`:
 ```console
 $ vncviewer viewer localhost:5901
 ```
@@ -44,7 +64,7 @@ $ docker run -p5901:5900 \
   --net=host \
   -v ~/.kube:/root/.kube \
   --rm -it --name kubedoom \
-  storaxdev/kubedoom:0.4.0 \
+  storaxdev/kubedoom:0.5.0 \
   -mode namespaces
 ```
 
@@ -57,7 +77,7 @@ example config from this repository:
 ```console
 $ kind create cluster --config kind-config.yaml
 Creating cluster "kind" ...
- ✓ Ensuring node image (kindest/node:v1.18.2) 🖼
+ ✓ Ensuring node image (kindest/node:v1.19.1) 🖼
  ✓ Preparing nodes 📦 📦
  ✓ Writing configuration 📜
  ✓ Starting control-plane 🕹️
@@ -69,7 +89,7 @@ You can now use your cluster with:
 
 kubectl cluster-info --context kind-kind
 
-Not sure what to do next? 😅 Check out https://kind.sigs.k8s.io/docs/user/quick-start/
+Not sure what to do next? 😅  Check out https://kind.sigs.k8s.io/docs/user/quick-start/
 ```
 
 This will spin up a 2 node cluster inside docker, with port 5900 exposed from
@@ -77,7 +97,6 @@ the worker node. Then run kubedoom inside the cluster by applying the manifest
 provided in this repository:
 
 ```console
-$ export KUBECONFIG="$(kind get kubeconfig-path --name="kind")"
 $ kubectl apply -f manifest/
 namespace/kubedoom created
 deployment.apps/kubedoom created
@@ -91,4 +110,4 @@ $ vncviewer viewer localhost:5900
 ```
 
 Kubedoom requires a service account with permissions to list all pods and delete
-them and uses kubectl 1.18.2.
+them and uses kubectl 1.19.2.

dockerdoom/trunk/setup/configfile.c

@@ -512,7 +512,7 @@ static void LoadDefaultCollection(default_collection_t *collection)
     
     while (!feof(f))
     {
-        if (fscanf (f, "%79s %[^\n]\n", defname, strparm) != 2)
+        if (fscanf (f, "%79s %99[^\n]\n", defname, strparm) != 2)
         {
             // This line doesn't match
           

dockerdoom/trunk/src/m_config.c

@@ -1312,7 +1312,7 @@ static void LoadDefaultCollection(default_collection_t *collection)
     
     while (!feof(f))
     {
-        if (fscanf (f, "%79s %[^\n]\n", defname, strparm) != 2)
+        if (fscanf (f, "%79s %99[^\n]\n", defname, strparm) != 2)
         {
             // This line doesn't match
           

kind-config.yaml

@@ -2,9 +2,9 @@ kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 nodes:
 - role: control-plane
-  image: kindest/node:v1.18.2@sha256:7b27a6d0f2517ff88ba444025beae41491b016bc6af573ba467b70c5e8e0d85f
+  image: kindest/node:v1.19.1@sha256:98cf5288864662e37115e362b23e4369c8c4a408f99cbc06e58ac30ddc721600
 - role: worker
-  image: kindest/node:v1.18.2@sha256:7b27a6d0f2517ff88ba444025beae41491b016bc6af573ba467b70c5e8e0d85f
+  image: kindest/node:v1.19.1@sha256:98cf5288864662e37115e362b23e4369c8c4a408f99cbc06e58ac30ddc721600
   extraPortMappings:
   - containerPort: 5900
     hostPort: 5900

manifest/deployment.yaml

@@ -18,7 +18,7 @@ spec:
       hostNetwork: true
       serviceAccountName: kubedoom
       containers:
-      - image: storaxdev/kubedoom:0.4.0
+      - image: storaxdev/kubedoom:0.5.0
         name: kubedoom
         ports:
         - containerPort: 5900