Skip to content

Commit

Permalink
fix: k8s deployment files
Browse files Browse the repository at this point in the history
  • Loading branch information
NGPixel authored Jun 5, 2024
1 parent eb40f82 commit 22d3c65
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 52 deletions.
34 changes: 0 additions & 34 deletions k8s/ietfweb/deployment.yaml

This file was deleted.

8 changes: 3 additions & 5 deletions k8s/ietfweb/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
namespace: ietfweb
namePrefix: ietfweb-
namespace: ietfwww
namePrefix: ietfwww-
configMapGenerator:
- name: files-cfgmap
files:
- local.py
- name: files-supervisor-cfg
files:
- supervisord.conf
resources:
- ietfweb.yaml
- django-config.yaml
- memcached.yaml
- wagtail.yaml
33 changes: 20 additions & 13 deletions k8s/ietfweb/ietfweb.yaml → k8s/ietfweb/wagtail.yaml
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
apiVersion: apps/v1
kind: Deployment
kind: StatefulSet
metadata:
name: ietfweb
name: wagtail
spec:
replicas: 1
revisionHistoryLimit: 2
selector:
matchLabels:
app: ietfweb
app: wagtail
strategy:
type: Recreate
template:
metadata:
labels:
app: ietfweb
app: wagtail
spec:
securityContext:
runAsNonRoot: true
containers:
# -----------------------------------------------------
# ietfweb Container
# wagtail Container
# -----------------------------------------------------
- name: ietfweb
- name: wagtail
image: "ghcr.io/ietf-tools/www:$APP_IMAGE_TAG"
imagePullPolicy: Always
ports:
Expand All @@ -37,7 +37,7 @@ spec:
mountPath: /app/static
- name: www-media
mountPath: /app/media
- name: www-supervisor-cfg
- name: www-cfg
mountPath: /app/supervisord.conf
subPath: supervisord.conf
- name: www-cfg
Expand All @@ -60,27 +60,34 @@ spec:
volumes:
# To be overriden with the actual shared volume
- name: dt-vol
- name: www-supervisor-cfg
configMap:
name: files-supervisor-cfg
# ---
- name: www-tmp
emptyDir:
sizeLimit: "2Gi"
- name: www-static
emptyDir:
sizeLimit: "2Gi"
- name: www-media
- name: www-cfg
configMap:
name: files-cfgmap
dnsPolicy: ClusterFirst
restartPolicy: Always
terminationGracePeriodSeconds: 30
volumeClaimTemplates:
- metadata:
name: www-media
spec:
accessModes:
- ReadWriteOnce
resources:
requests:
storage: 5Gi
storageClassName: "generic"
---
apiVersion: v1
kind: Service
metadata:
name: ietfweb
name: wagtail
spec:
type: ClusterIP
ports:
Expand All @@ -89,4 +96,4 @@ spec:
protocol: TCP
name: http
selector:
app: ietfweb
app: wagtail

0 comments on commit 22d3c65

Please sign in to comment.