Skip to content

Commit

Permalink
Enable htadmin for #169
Browse files Browse the repository at this point in the history
  • Loading branch information
piercema committed Apr 6, 2023
1 parent 195033d commit 695e59b
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 2 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -46,3 +46,4 @@ __pycache__/
__pypackages__/
*.py[cod]
*$py.class
.DS_Store
17 changes: 15 additions & 2 deletions kubernetes/19-htadmin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,27 @@ spec:
- configMapRef:
name: auth-common-env
env:
- name: HTADMIN_DISABLED
value: "true"
- name: VIRTUAL_HOST
value: "htadmin.malcolm.local"
volumeMounts:
- mountPath: /var/local/ca-trust/configmap
name: htadmin-var-local-catrust-volume
- mountPath: /var/www/htadmin/config/auth
name: htadmin-config-volume
subPath: "auth"
- mountPath: /var/www/htadmin/config/default/configmap
name: htadmin-config-default-volume
- mountPath: /var/www/htadmin/config/
name: htadmin-config-volume
subPath: "htadmin"
volumes:
- name: htadmin-var-local-catrust-volume
configMap:
name: var-local-catrust
- name: htadmin-config-volume
persistentVolumeClaim:
claimName: config-claim
- name: htadmin-config-default-volume
configMap:
name: htadmin-config

26 changes: 26 additions & 0 deletions kubernetes/99-nginx-proxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,20 @@ spec:
selector:
name: nginx-proxy-deployment

---
apiVersion: v1
kind: Service
metadata:
name: nginx-htadmin-proxy
namespace: malcolm
spec:
ports:
- port: 488
protocol: TCP
selector:
name: nginx-proxy-deployment


---
apiVersion: apps/v1
kind: Deployment
Expand All @@ -36,6 +50,7 @@ spec:
ports:
- containerPort: 443
- containerPort: 8443
- containerPort: 488
envFrom:
- configMapRef:
name: process-env
Expand Down Expand Up @@ -66,6 +81,11 @@ spec:
mountPath: /etc/nginx/dhparam/configmap
- name: nginx-opensearch-curlrc-volume
mountPath: /var/local/curlrc/configmap
- name: nginx-etc-auth-volume
mountPath: /etc/nginx/auth
subPath: "auth"
- name: nginx-etc-auth-default-volume
mountPath: /tmp/auth/default/configmap
volumes:
- name: nginx-etc-nginx-volume
configMap:
Expand All @@ -82,3 +102,9 @@ spec:
- name: nginx-opensearch-curlrc-volume
configMap:
name: opensearch-curlrc
- name: nginx-etc-auth-volume
persistentVolumeClaim:
claimName: config-claim
- name: nginx-etc-auth-default-volume
configMap:
name: etc-nginx-auth

0 comments on commit 695e59b

Please sign in to comment.