Update: k8s config

pwnsky · Aug 11, 2024 · 88b345b · 88b345b
1 parent d906cb2
commit 88b345b
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 5 deletions.
diff --git a/docker/build_image.sh b/docker/build_image.sh
@@ -6,8 +6,8 @@ source ../tools/common.sh
 build_type='docker'
 is_build_third_party=0
 is_build_sqkctl=0
-src_image_tag=pwnsky/squick_src:1.1
-bin_image_tag=pwnsky/squick:1.1
+src_image_tag=pwnsky/squick_src:1.2
+bin_image_tag=pwnsky/squick:1.2
 build_container=squick_src_build
 
 cd $project_path

diff --git a/kubernetes/gen_k8s_config.sh b/kubernetes/gen_k8s_config.sh
@@ -1,6 +1,9 @@
 #! /bin/bash
 
 namespace="pwnsky"
-image="pwnsky"
+image="pwnsky/squick:1.1"
+
+rm -rf k8s_cfg
+mkdir -p k8s_cfg
 
 
diff --git a/kubernetes/node/master.yaml → kubernetes/tmpl/master.yaml b/kubernetes/node/master.yaml → kubernetes/tmpl/master.yaml
@@ -8,7 +8,7 @@ metadata:
     app: squick
 spec:
   serviceName: "svc-squick-master"
-  replicas: 2
+  replicas: 3
   selector:
     matchLabels:
       app: squick
@@ -19,7 +19,7 @@ spec:
     spec:
       containers:
         - name: squick
-          image: pwnsky/squick:1.1
+          image: pwnsky/squick:1.2
           imagePullPolicy: Never
           command: ["/bin/bash", "-c"]
           args:

diff --git a/kubernetes/tmpl/master_svc.yaml b/kubernetes/tmpl/master_svc.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: svc-squick-master
+spec:
+  selector:
+    app: squick
+  ports:
+    - protocol: TCP
+      port: 10001
+      targetPort: 10001
+  type: ClusterIP
diff --git a/kubernetes/tmpl/proxy.yaml b/kubernetes/tmpl/proxy.yaml
@@ -0,0 +1,40 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: squick-proxy
+  namespace: default
+  labels:
+    app: squick
+spec:
+  serviceName: "svc-squick-proxy"
+  replicas: 3
+  selector:
+    matchLabels:
+      app: squick
+  template:
+    metadata:
+      labels:
+        app: squick
+    spec:
+      containers:
+        - name: squick
+          image: pwnsky/squick:1.2
+          imagePullPolicy: Never
+          command: ["/bin/bash", "-c"]
+          args:
+            - >
+              /squick/script/squick.sh type=proxy id=500${HOSTNAME##*-} area=0 ip=$(POD_IP) port=10501 ws_port=10502 master_ip=squick-master-0 master_port=10001 logshow=0
+          env:
+            - name: POD_NAME
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.name
+            - name: POD_IP
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: POD_NAMESPACE
+              valueFrom:
+                fieldRef:
+                  fieldPath: metadata.namespace