Skip to content

Commit

Permalink
Cleanup of a few issues in k8s deploy plus beginning kind cluster setup
Browse files Browse the repository at this point in the history
  • Loading branch information
Eric Smalling committed Dec 22, 2021
1 parent 0e6a87f commit c5ab612
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 3 deletions.
1 change: 1 addition & 0 deletions kind-init.sh
3 changes: 2 additions & 1 deletion log4shell-goof/log4shell-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
FROM maven:3-jdk-8-slim as build
COPY . .
COPY pom.xml pom.xml
COPY src src
RUN --mount=target=$HOME/.m2,type=cache mvn clean compile assembly:single

FROM openjdk:8 as ldap
Expand Down
1 change: 1 addition & 0 deletions log4shell-goof/log4shell-server/k8s/imagebuild.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
MYDIR=$(dirname $0)
if [[ "$1" == "" ]]; then
read -e -i "${DOCKER_ACCOUNT}" -p "Please enter your DockerHub user/account name: " input
name="${input:-$DOCKER_ACCOUNT}"
Expand Down
3 changes: 3 additions & 0 deletions todolist-goof/.dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
exploits
k8s
**/target
9 changes: 7 additions & 2 deletions todolist-goof/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
FROM maven:3-jdk-8-slim as build

RUN mkdir /usr/src/goof
COPY . /usr/src/goof
WORKDIR /usr/src/goof

COPY pom.xml pom.xml
COPY src src
COPY todolist-core todolist-core
COPY todolist-web-common todolist-web-common
COPY todolist-web-struts todolist-web-struts
RUN --mount=target=$HOME/.m2,type=cache mvn install

FROM tomcat:8.5.21

RUN mkdir /tmp/extracted_files
COPY --chown=tomcat:tomcat web.xml /usr/local/tomcat/conf/web.xml
COPY web.xml /usr/local/tomcat/conf/web.xml
COPY --from=build /usr/src/goof/todolist-web-struts/target/todolist /usr/local/tomcat/webapps/todolist
COPY --from=build /usr/local/openjdk-8/bin/native2ascii /docker-java-home/jre/bin/native2ascii
COPY --from=build /usr/local/openjdk-8/lib/tools.jar /docker-java-home/jre/lib/tools.jar
Expand Down
4 changes: 4 additions & 0 deletions todolist-goof/k8s/kind-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
networking:
disableDefaultCNI: true
5 changes: 5 additions & 0 deletions todolist-goof/k8s/kind-init.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
MYDIR="$(dirname "$(readlink "$0")")"
kind create cluster --config $MYDIR/kind-config.yaml
kubectl apply -f $MYDIR/calico.yaml
$MYDIR/lb.sh
13 changes: 13 additions & 0 deletions todolist-goof/k8s/lb.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
MYDIR=$(dirname $0)
export KIND_SUBNET=$(docker network inspect kind -f '{{(index .IPAM.Config 0).Subnet}}' | cut -f 1,2 -d '.')
kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/master/manifests/namespace.yaml
kubectl create secret generic -n metallb-system memberlist --from-literal=secretkey="$(openssl rand -base64 128)"
kubectl apply -f https://raw.githubusercontent.com/metallb/metallb/master/manifests/metallb.yaml
kubectl wait --namespace=metallb-system \
--for=condition=ready pod \
--selector=app=metallb \
--timeout=90s
cat $MYDIR/metallb-config.yaml | envsubst | kubectl apply -f -


12 changes: 12 additions & 0 deletions todolist-goof/k8s/metallb-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
apiVersion: v1
kind: ConfigMap
metadata:
namespace: metallb-system
name: config
data:
config: |
address-pools:
- name: default
protocol: layer2
addresses:
- ${KIND_SUBNET}.255.200-${KIND_SUBNET}.255.250

0 comments on commit c5ab612

Please sign in to comment.