diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 1ee94c4eb..5eb4e73dc 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,6 +2,7 @@ "recommendations": [ "abusaidm.html-snippets", "alefragnani.project-manager", + "bierner.markdown-mermaid", //"Bridgecrew.checkov", "christian-kohler.path-intellisense", "DavidAnson.vscode-markdownlint", diff --git a/README.md b/README.md index e5fe0e727..c01e501a9 100644 --- a/README.md +++ b/README.md @@ -102,20 +102,19 @@ graph TD wan1[
WAN 500/50
192.168.100.1
]---router{
PfSense
10.0.0.2
} wan2[
LTE 100/25 Mb
192.168.1.1
]---router router---ap{
TP-AX1800
10.0.0.1
} -ap---switch[
TL-SG1005D
] +ap---switch[
USW-Flex-XG
] subgraph HomeLab - switch-.-truenas(
TrueNas
10.0.0.3
) - switch-.-kvm-1(
kvm-1
10.0.0.107
) - switch-.-kvm-2(
kvm-2
10.0.0.108
) - switch-.-kvm-3(
kvm-3
10.0.0.109
) + switch-.-|1 GbE|truenas(
TrueNas
10.0.0.3
) + switch-.-|10 GbE|kvm-1(
kvm-1
10.0.0.107
) + switch-.-|10 GbE|kvm-2(
kvm-2
10.0.0.108
) + switch-.-|10 GbE|kvm-3(
kvm-3
10.0.0.109
) subgraph OKD KVM-1 kvm-1-.-server-1(
server-1
10.0.0.101
) kvm-1-.-infra-1(
infra-1
10.0.0.121
) kvm-1-.-worker-1(
worker-1
10.0.0.111
) kvm-1-.-worker-4(
worker-4
10.0.0.114
) end - subgraph OKD KVM-2 kvm-2-.-server-2(
server-2
10.0.0.102
) kvm-2-.-infra-2(
infra-2
10.0.0.121
) diff --git a/img/Heimdall.png b/img/Heimdall.png index 9663dcfd7..2c812a8c8 100644 Binary files a/img/Heimdall.png and b/img/Heimdall.png differ diff --git a/kubernetes/unifi-network-application/README.md b/kubernetes/unifi-network-application/README.md index ba856ab1f..74f7945b3 100644 --- a/kubernetes/unifi-network-application/README.md +++ b/kubernetes/unifi-network-application/README.md @@ -1,3 +1,14 @@ # Unifi Network Application +```bash +keytool -importkeystore \ + -srckeystore keystore \ + -destkeystore keystore.p12 \ + -deststoretype PKCS12 \ + -srcalias unifi \ + -deststorepass aircontrolenterprise \ + -destkeypass aircontrolenterprise +``` + + diff --git a/kubernetes/unifi-network-application/base/ingress.yaml b/kubernetes/unifi-network-application/base/ingress.yaml index 7246681dd..ca168ad28 100644 --- a/kubernetes/unifi-network-application/base/ingress.yaml +++ b/kubernetes/unifi-network-application/base/ingress.yaml @@ -11,8 +11,10 @@ metadata: app.kubernetes.io/managed-by: Helm annotations: argocd.argoproj.io/sync-wave: "1" - route.openshift.io/termination: passthrough + route.openshift.io/destination-ca-certificate-secret: internal-cert + route.openshift.io/termination: reencrypt spec: + ingressClassName: openshift-default rules: - host: "unifi.arthurvardevanyan.com" http: diff --git a/kubernetes/unifi-network-application/base/kustomization.yaml b/kubernetes/unifi-network-application/base/kustomization.yaml index 6ee988d8b..c022f651d 100644 --- a/kubernetes/unifi-network-application/base/kustomization.yaml +++ b/kubernetes/unifi-network-application/base/kustomization.yaml @@ -6,6 +6,7 @@ resources: - ./service.yaml - ./longhorn.yaml - ./pvc.yaml + - ./secret.yaml - ./ingress.yaml - ./statefulset.yaml - ./mongodb/mongodb.yaml diff --git a/kubernetes/unifi-network-application/base/mongodb/mongodb.yaml b/kubernetes/unifi-network-application/base/mongodb/mongodb.yaml index 237326716..7f9e8841d 100644 --- a/kubernetes/unifi-network-application/base/mongodb/mongodb.yaml +++ b/kubernetes/unifi-network-application/base/mongodb/mongodb.yaml @@ -40,18 +40,18 @@ spec: resources: limits: cpu: "150m" - memory: 512Mi + memory: 768Mi requests: cpu: "25m" - memory: 128Mi + memory: 256Mi - name: mongodb-agent resources: limits: cpu: "50m" - memory: 64Mi + memory: 128Mi requests: cpu: "25m" - memory: 32Mi + memory: 64Mi initContainers: - name: mongodb-agent-readinessprobe resources: diff --git a/kubernetes/unifi-network-application/base/secret.yaml b/kubernetes/unifi-network-application/base/secret.yaml new file mode 100644 index 000000000..643ea0333 --- /dev/null +++ b/kubernetes/unifi-network-application/base/secret.yaml @@ -0,0 +1,9 @@ +apiVersion: v1 +kind: Secret +metadata: + name: internal-cert + namespace: unifi-network-application +data: + tls.crt: + tls.key: +type: Opaque