diff --git a/factorio/kustomization.yaml b/factorio/kustomization.yaml index 4db2860..4ae436c 100644 --- a/factorio/kustomization.yaml +++ b/factorio/kustomization.yaml @@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - main.yaml - - svc.yaml \ No newline at end of file + - main.yaml \ No newline at end of file diff --git a/factorio/main.yaml b/factorio/main.yaml index 55f25f6..3c96825 100644 --- a/factorio/main.yaml +++ b/factorio/main.yaml @@ -246,6 +246,33 @@ metadata: name: factorio-settings --- apiVersion: v1 +kind: Service +metadata: + annotations: + io.cilium/lb-ipam-ips: 192.168.0.183 + labels: + app.kubernetes.io/instance: factorio + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: factorio + app.kubernetes.io/version: stable + helm.sh/chart: factorio-1.2.2 + name: factorio +spec: + ports: + - name: rcon + port: 27015 + protocol: TCP + targetPort: rcon + - name: server + port: 34197 + protocol: UDP + targetPort: server + selector: + app.kubernetes.io/instance: factorio + app.kubernetes.io/name: factorio + type: LoadBalancer +--- +apiVersion: v1 kind: PersistentVolumeClaim metadata: labels: diff --git a/factorio/src/values.yaml b/factorio/src/values.yaml index 2af40ad..69ced9e 100644 --- a/factorio/src/values.yaml +++ b/factorio/src/values.yaml @@ -73,6 +73,9 @@ service: primary: true port: 27015 protocol: TCP + type: LoadBalancer + annotations: + io.cilium/lb-ipam-ips: 192.168.0.183 ingress: # -- Enable and configure ingress settings for the chart under this key. diff --git a/factorio/svc.yaml b/factorio/svc.yaml deleted file mode 100644 index b81ae80..0000000 --- a/factorio/svc.yaml +++ /dev/null @@ -1,27 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - labels: - app.kubernetes.io/instance: factorio - app.kubernetes.io/managed-by: Helm - app.kubernetes.io/name: factorio - app.kubernetes.io/version: stable - helm.sh/chart: factorio-1.2.2 - name: factorio - annotations: - io.cilium/lb-ipam-ips: 192.168.0.183 -spec: - ports: - - name: rcon - port: 27015 - protocol: TCP - targetPort: rcon - - name: server - port: 34197 - protocol: UDP - targetPort: server - selector: - app.kubernetes.io/instance: factorio - app.kubernetes.io/name: factorio - type: LoadBalancer \ No newline at end of file diff --git a/teamspeak/kustomization.yaml b/teamspeak/kustomization.yaml index 4db2860..4ae436c 100644 --- a/teamspeak/kustomization.yaml +++ b/teamspeak/kustomization.yaml @@ -3,5 +3,4 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - - main.yaml - - svc.yaml \ No newline at end of file + - main.yaml \ No newline at end of file diff --git a/teamspeak/main.yaml b/teamspeak/main.yaml index 9e7a274..040c08f 100644 --- a/teamspeak/main.yaml +++ b/teamspeak/main.yaml @@ -1,4 +1,35 @@ apiVersion: v1 +kind: Service +metadata: + annotations: + io.cilium/lb-ipam-ips: 192.168.0.184 + labels: + app.kubernetes.io/instance: teamspeak + app.kubernetes.io/managed-by: Helm + app.kubernetes.io/name: teamspeak + app.kubernetes.io/version: 3.13.6 + helm.sh/chart: teamspeak-0.7.2 + name: teamspeak +spec: + ports: + - name: filetransfer + port: 30033 + protocol: TCP + targetPort: filetransfer + - name: serverquery + port: 10011 + protocol: TCP + targetPort: serverquery + - name: voice + port: 9987 + protocol: UDP + targetPort: voice + selector: + app.kubernetes.io/instance: teamspeak + app.kubernetes.io/name: teamspeak + type: LoadBalancer +--- +apiVersion: v1 kind: PersistentVolumeClaim metadata: labels: diff --git a/teamspeak/src/values.yaml b/teamspeak/src/values.yaml index 119d7b6..93059fe 100644 --- a/teamspeak/src/values.yaml +++ b/teamspeak/src/values.yaml @@ -18,11 +18,11 @@ image: env: TZ: UTC TS3SERVER_LICENSE: accept - # TS3SERVER_SERVERADMIN_PASSWORD: - # valueFrom: - # secretKeyRef: - # name: teamspeak - # key: serveradmin_password + TS3SERVER_SERVERADMIN_PASSWORD: + valueFrom: + secretKeyRef: + name: teamspeak + key: serveradmin_password # -- Configures service settings for the chart. @@ -44,6 +44,9 @@ service: primary: true port: 9987 protocol: UDP + type: LoadBalancer + annotations: + io.cilium/lb-ipam-ips: 192.168.0.184 probes: readiness: diff --git a/teamspeak/svc.yaml b/teamspeak/svc.yaml deleted file mode 100644 index 7307b93..0000000 --- a/teamspeak/svc.yaml +++ /dev/null @@ -1,25 +0,0 @@ ---- -apiVersion: v1 -kind: Service -metadata: - name: teamspeak - annotations: - io.cilium/lb-ipam-ips: 192.168.0.182 -spec: - ports: - - name: filetransfer - port: 30033 - protocol: TCP - targetPort: filetransfer - - name: serverquery - port: 10011 - protocol: TCP - targetPort: serverquery - - name: voice - port: 9987 - protocol: UDP - targetPort: voice - selector: - app.kubernetes.io/instance: teamspeak - app.kubernetes.io/name: teamspeak - type: LoadBalancer \ No newline at end of file