1
0
forked from k-space/kube

camtiler: Clean ups

This commit is contained in:
Lauri Võsandi 2022-12-14 19:29:13 +02:00
parent 2a8c685345
commit 3dfa8e3203
2 changed files with 68 additions and 59 deletions

View File

@ -8,7 +8,7 @@ metadata:
keel.sh/trigger: poll keel.sh/trigger: poll
spec: spec:
revisionHistoryLimit: 0 revisionHistoryLimit: 0
replicas: 1 replicas: 2
selector: selector:
matchLabels: &selectorLabels matchLabels: &selectorLabels
app.kubernetes.io/name: camtiler app.kubernetes.io/name: camtiler
@ -41,13 +41,15 @@ kind: Deployment
metadata: metadata:
name: logmower-frontend name: logmower-frontend
spec: spec:
revisionHistoryLimit: 0
replicas: 2
selector: selector:
matchLabels: matchLabels: &selectorLabels
app: logmower-frontend app.kubernetes.io/name: camtiler
component: logmower-frontend
template: template:
metadata: metadata:
labels: labels: *selectorLabels
app: logmower-frontend
spec: spec:
containers: containers:
- name: logmower-frontend - name: logmower-frontend
@ -61,13 +63,15 @@ kind: Deployment
metadata: metadata:
name: logmower-eventsource name: logmower-eventsource
spec: spec:
revisionHistoryLimit: 0
replicas: 2
selector: selector:
matchLabels: matchLabels: &selectorLabels
app: logmower-eventsource app.kubernetes.io/name: camtiler
component: logmower-eventsource
template: template:
metadata: metadata:
labels: labels: *selectorLabels
app: logmower-eventsource
spec: spec:
containers: containers:
- name: logmower-eventsource - name: logmower-eventsource
@ -86,23 +90,25 @@ spec:
- name: BACKEND - name: BACKEND
value: 'camtiler' value: 'camtiler'
- name: BACKEND_BROKER_URL - name: BACKEND_BROKER_URL
value: 'http://camera-event-broker' value: 'http://logmower-event-broker'
--- ---
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: camera-event-broker name: logmower-event-broker
spec: spec:
revisionHistoryLimit: 0
replicas: 5
selector: selector:
matchLabels: matchLabels: &selectorLabels
app: camera-event-broker app.kubernetes.io/name: camtiler
component: logmower-event-broker
template: template:
metadata: metadata:
labels: labels: *selectorLabels
app: camera-event-broker
spec: spec:
containers: containers:
- name: camera-event-broker - name: logmower-event-broker
image: harbor.k-space.ee/k-space/camera-event-broker image: harbor.k-space.ee/k-space/camera-event-broker
ports: ports:
- containerPort: 3000 - containerPort: 3000
@ -133,7 +139,8 @@ metadata:
spec: spec:
type: ClusterIP type: ClusterIP
selector: selector:
app: logmower-frontend app.kubernetes.io/name: camtiler
component: logmower-frontend
ports: ports:
- protocol: TCP - protocol: TCP
port: 8080 port: 8080
@ -145,7 +152,8 @@ metadata:
spec: spec:
type: ClusterIP type: ClusterIP
selector: selector:
app: logmower-eventsource app.kubernetes.io/name: camtiler
component: logmower-eventsource
ports: ports:
- protocol: TCP - protocol: TCP
port: 3002 port: 3002
@ -153,11 +161,12 @@ spec:
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
name: camera-event-broker name: logmower-event-broker
spec: spec:
type: ClusterIP type: ClusterIP
selector: selector:
app: camera-event-broker app.kubernetes.io/name: camtiler
component: logmower-event-broker
ports: ports:
- protocol: TCP - protocol: TCP
port: 80 port: 80
@ -344,12 +353,12 @@ spec:
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: NetworkPolicy kind: NetworkPolicy
metadata: metadata:
name: log-viewer-backend name: logmower-eventsource
spec: spec:
podSelector: podSelector:
matchLabels: matchLabels:
app.kubernetes.io/name: camtiler app.kubernetes.io/name: camtiler
component: log-viewer-backend component: logmower-eventsource
policyTypes: policyTypes:
- Ingress - Ingress
- Egress - Egress
@ -358,14 +367,9 @@ spec:
- podSelector: - podSelector:
matchLabels: matchLabels:
app: mongodb-svc app: mongodb-svc
- to: - podSelector:
# Minio access via Traefik's public endpoint
- namespaceSelector:
matchLabels: matchLabels:
kubernetes.io/metadata.name: traefik component: logmower-event-broker
podSelector:
matchLabels:
app.kubernetes.io/name: traefik
ingress: ingress:
- from: - from:
- namespaceSelector: - namespaceSelector:
@ -378,12 +382,39 @@ spec:
apiVersion: networking.k8s.io/v1 apiVersion: networking.k8s.io/v1
kind: NetworkPolicy kind: NetworkPolicy
metadata: metadata:
name: log-viewer-frontend name: logmower-event-broker
spec: spec:
podSelector: podSelector:
matchLabels: matchLabels:
app.kubernetes.io/name: camtiler app.kubernetes.io/name: camtiler
component: log-viewer-frontend component: logmower-event-broker
policyTypes:
- Ingress
- Egress
egress:
- to:
# Minio access via Traefik's public endpoint
- namespaceSelector:
matchLabels:
kubernetes.io/metadata.name: traefik
podSelector:
matchLabels:
app.kubernetes.io/name: traefik
ingress:
- from:
- podSelector:
matchLabels:
component: logmower-eventsource
---
apiVersion: networking.k8s.io/v1
kind: NetworkPolicy
metadata:
name: logmower-frontend
spec:
podSelector:
matchLabels:
app.kubernetes.io/name: camtiler
component: logmower-frontend
policyTypes: policyTypes:
- Ingress - Ingress
- Egress - Egress

View File

@ -805,11 +805,6 @@ spec:
node appears to use the IP of the ingress node; this requires a node appears to use the IP of the ingress node; this requires a
permissive L2 network. [Default: Tunnel]' permissive L2 network. [Default: Tunnel]'
type: string type: string
bpfHostConntrackBypass:
description: 'BPFHostConntrackBypass Controls whether to bypass Linux
conntrack in BPF mode for workloads and services. [Default: true
- bypass Linux conntrack]'
type: boolean
bpfKubeProxyEndpointSlicesEnabled: bpfKubeProxyEndpointSlicesEnabled:
description: BPFKubeProxyEndpointSlicesEnabled in BPF mode, controls description: BPFKubeProxyEndpointSlicesEnabled in BPF mode, controls
whether Felix's embedded kube-proxy accepts EndpointSlices or not. whether Felix's embedded kube-proxy accepts EndpointSlices or not.
@ -1342,8 +1337,8 @@ spec:
type: boolean type: boolean
vxlanEnabled: vxlanEnabled:
description: 'VXLANEnabled overrides whether Felix should create the description: 'VXLANEnabled overrides whether Felix should create the
VXLAN tunnel device for IPv4 VXLAN networking. Optional as Felix VXLAN tunnel device for VXLAN networking. Optional as Felix determines
determines this based on the existing IP pools. [Default: nil (unset)]' this based on the existing IP pools. [Default: nil (unset)]'
type: boolean type: boolean
vxlanMTU: vxlanMTU:
description: 'VXLANMTU is the MTU to set on the IPv4 VXLAN tunnel description: 'VXLANMTU is the MTU to set on the IPv4 VXLAN tunnel
@ -2776,7 +2771,7 @@ spec:
for internal use only.' for internal use only.'
type: boolean type: boolean
natOutgoing: natOutgoing:
description: When natOutgoing is true, packets sent from Calico networked description: When nat-outgoing is true, packets sent from Calico networked
containers in this pool to destinations outside of this pool will containers in this pool to destinations outside of this pool will
be masqueraded. be masqueraded.
type: boolean type: boolean
@ -9651,14 +9646,6 @@ spec:
type: string type: string
type: object type: object
type: array type: array
fipsMode:
description: 'FIPSMode uses images and features only that are using
FIPS 140-2 validated cryptographic modules and standards. Default:
Disabled'
enum:
- Enabled
- Disabled
type: string
flexVolumePath: flexVolumePath:
description: FlexVolumePath optionally specifies a custom path for description: FlexVolumePath optionally specifies a custom path for
FlexVolume. If not specified, FlexVolume will be enabled by default. FlexVolume. If not specified, FlexVolume will be enabled by default.
@ -9702,7 +9689,7 @@ spec:
kubeletVolumePluginPath: kubeletVolumePluginPath:
description: 'KubeletVolumePluginPath optionally specifies enablement description: 'KubeletVolumePluginPath optionally specifies enablement
of Calico CSI plugin. If not specified, CSI will be enabled by default. of Calico CSI plugin. If not specified, CSI will be enabled by default.
If set to ''None'', CSI will be disabled. Default: /var/lib/kubelet' If set to "None", CSI will be disabled. Default: /var/lib/kubelet'
type: string type: string
kubernetesProvider: kubernetesProvider:
description: KubernetesProvider specifies a particular provider of description: KubernetesProvider specifies a particular provider of
@ -15811,14 +15798,6 @@ spec:
type: string type: string
type: object type: object
type: array type: array
fipsMode:
description: 'FIPSMode uses images and features only that are
using FIPS 140-2 validated cryptographic modules and standards.
Default: Disabled'
enum:
- Enabled
- Disabled
type: string
flexVolumePath: flexVolumePath:
description: FlexVolumePath optionally specifies a custom path description: FlexVolumePath optionally specifies a custom path
for FlexVolume. If not specified, FlexVolume will be enabled for FlexVolume. If not specified, FlexVolume will be enabled
@ -15861,9 +15840,8 @@ spec:
type: array type: array
kubeletVolumePluginPath: kubeletVolumePluginPath:
description: 'KubeletVolumePluginPath optionally specifies enablement description: 'KubeletVolumePluginPath optionally specifies enablement
of Calico CSI plugin. If not specified, CSI will be enabled of Calico CSI plugin. If not specified, CSI will be enabled by default.
by default. If set to ''None'', CSI will be disabled. Default: If set to "None", CSI will be disabled. Default: /var/lib/kubelet'
/var/lib/kubelet'
type: string type: string
kubernetesProvider: kubernetesProvider:
description: KubernetesProvider specifies a particular provider description: KubernetesProvider specifies a particular provider