diff --git a/deploy/kubernetes/manifests/influxdb.yaml b/deploy/kubernetes/manifests/influxdb.yaml index 6aef67f..f4a8377 100644 --- a/deploy/kubernetes/manifests/influxdb.yaml +++ b/deploy/kubernetes/manifests/influxdb.yaml @@ -48,7 +48,6 @@ spec: mountPath: /var/lib/influxdb resources: limits: - cpu: "0.7" memory: "512Mi" requests: memory: "128Mi" diff --git a/deploy/kubernetes/manifests/ingress.yaml b/deploy/kubernetes/manifests/ingress.yaml index 33ec10c..1adb987 100644 --- a/deploy/kubernetes/manifests/ingress.yaml +++ b/deploy/kubernetes/manifests/ingress.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: wrestlingdev-app-ingress-external @@ -11,9 +11,12 @@ spec: http: paths: - path: / + pathType: Prefix backend: - serviceName: wrestlingdev-app - servicePort: 80 + service: + name: wrestlingdev-app + port: + number: 80 tls: - hosts: - wrestlingdev.com diff --git a/deploy/kubernetes/manifests/mariadb-standalone.yaml b/deploy/kubernetes/manifests/mariadb-standalone.yaml index 4d4e37e..358afce 100644 --- a/deploy/kubernetes/manifests/mariadb-standalone.yaml +++ b/deploy/kubernetes/manifests/mariadb-standalone.yaml @@ -64,7 +64,6 @@ spec: mountPath: /var/lib/mysql resources: limits: - cpu: "0.5" memory: "512Mi" requests: memory: "256Mi" @@ -128,7 +127,6 @@ spec: mountPath: /var/lib/mysql resources: limits: - cpu: "0.2" memory: "100Mi" requests: memory: "50Mi" @@ -162,7 +160,6 @@ spec: value: "7" resources: limits: - cpu: "100m" memory: "128Mi" requests: memory: "32Mi" diff --git a/deploy/kubernetes/manifests/memcached-standalone.yaml b/deploy/kubernetes/manifests/memcached-standalone.yaml index 9d70563..91803e9 100644 --- a/deploy/kubernetes/manifests/memcached-standalone.yaml +++ b/deploy/kubernetes/manifests/memcached-standalone.yaml @@ -36,7 +36,6 @@ spec: - containerPort: 11211 resources: limits: - cpu: "0.2" memory: "64Mi" requests: memory: "64Mi" diff --git a/deploy/kubernetes/manifests/wrestlingdev.yaml b/deploy/kubernetes/manifests/wrestlingdev.yaml index 0c01030..04455f8 100644 --- a/deploy/kubernetes/manifests/wrestlingdev.yaml +++ b/deploy/kubernetes/manifests/wrestlingdev.yaml @@ -100,7 +100,6 @@ spec: key: influxdb_port resources: limits: - cpu: "0.5" memory: "768Mi" requests: memory: "300Mi" @@ -119,7 +118,7 @@ metadata: name: wrestlingdev-app-deployment-autoscale spec: scaleTargetRef: - apiVersion: extensions/v1beta1 + apiVersion: apps/v1 kind: Deployment name: wrestlingdev-app-deployment minReplicas: 2 @@ -223,7 +222,6 @@ spec: args: ["exec", "bin/delayed_job", "-n", "1", "run"] resources: limits: - cpu: "0.5" memory: "512Mi" requests: memory: "200Mi"