Merge pull request #81 from antoniasymeonidou/master

Change Cpu Defaults

Author: vaslabs

README.md

@@ -46,7 +46,7 @@ kubeyml:gen
 | command | Command for the container | empty |
 | args | arguments for the command | empty Seq |
 | envs | Map of environment variables, raw, field path or secret are supported| empty |
-| resourceRequests | Resource requests (cpu in the form of m, memory in the form of MiB |  `Resource(Cpu(500), Memory(256))` |
+| resourceRequests | Resource requests (cpu in the form of m, memory in the form of MiB |  `Resource(Cpu(100), Memory(256))` |
 | resourceLimits | Resource limits (cpu in the form of m, memory in the form of MiB |  `Resource(Cpu(1000), Memory(512))` |
 | target | The directory to output the deployment.yml | target of this project |
 | deployment | The key to access the whole Deployment definition, exposed for further customisation | Instance with above defaults |

site/docs/deployment/index.md

@@ -77,7 +77,7 @@ spec:
                     periodSeconds: 10
                 resources:
                     requests:
-                        cpu: 500m
+                        cpu: 100m
                         memory: 256Mi
                     limits:
                         cpu: 1000m

src/main/scala/kubeyml/deployment/Protocol.scala

@@ -220,7 +220,7 @@ case class Container(
 }
 
 case class Resources(
-  requests: Resource = Resource(Cpu(500), Memory(256)),
+  requests: Resource = Resource(Cpu(100), Memory(256)),
   limits: Resource = Resource(Cpu(1000), Memory(512))
 ) {
   require(requests.cpu.value <= limits.cpu.value)

src/test/scala/kubeyml/deployment/KubernetesStateYamlSpec.scala

@@ -126,7 +126,7 @@ class KubernetesStateYamlSpec extends AnyFlatSpec with Matchers with ScalaCheckP
                                     |          resources:
                                     |            requests:
                                     |              memory: "256Mi"
-                                    |              cpu: "500m"
+                                    |              cpu: "100m"
                                     |            limits:
                                     |              memory: "512Mi"
                                     |              cpu: "1000m"
@@ -204,7 +204,7 @@ class KubernetesStateYamlSpec extends AnyFlatSpec with Matchers with ScalaCheckP
                                     |          resources:
                                     |            requests:
                                     |              memory: "256Mi"
-                                    |              cpu: "500m"
+                                    |              cpu: "100m"
                                     |            limits:
                                     |              memory: "512Mi"
                                     |              cpu: "1000m"
@@ -280,7 +280,7 @@ class KubernetesStateYamlSpec extends AnyFlatSpec with Matchers with ScalaCheckP
                                     |          resources:
                                     |            requests:
                                     |              memory: "256Mi"
-                                    |              cpu: "500m"
+                                    |              cpu: "100m"
                                     |            limits:
                                     |              memory: "512Mi"
                                     |              cpu: "1000m"
@@ -295,81 +295,6 @@ class KubernetesStateYamlSpec extends AnyFlatSpec with Matchers with ScalaCheckP
     }
   }
 
-  "kubernetes sample" must "be generated from definition" in {
-
-    forAll(lowEmptyChance) { deploymentTestParts: DeploymentTestParts =>
-      import deploymentTestParts._
-      whenever(nonEmptyParts(deploymentTestParts)) {
-        val deployment = deploy
-          .namespace(namespace)
-          .service(serviceName)
-          .withImage(dockerImage)
-          .withProbes(
-            livenessProbe = HttpProbe(HttpGet("/health", 8080, List.empty), initialDelay = 3 seconds, period = 5 seconds),
-            readinessProbe = NoProbe
-          )
-          .replicas(1)
-          .addPorts(List(Port(Some("app"), 8080)))
-          .annotateSpecTemplate(Map(metadataKey -> metadataValue))
-          .env(envName, envValue)
-
-        val expectedYaml = parse(s"""
-             |apiVersion: apps/v1
-             |kind: Deployment
-             |metadata:
-             |  name: &name "${serviceName}"
-             |  namespace: "${namespace}"
-             |spec:
-             |  replicas: 1
-             |  selector:
-             |    matchLabels:
-             |      app: *name
-             |  strategy:
-             |    type: RollingUpdate
-             |    rollingUpdate:
-             |      maxSurge: 0
-             |      maxUnavailable: 1
-             |  template:
-             |    metadata:
-             |      labels:
-             |        app: *name
-             |      annotations:
-             |        ${metadataKey}: "${metadataValue}"
-             |    spec:
-             |      containers:
-             |        - image: "${dockerImage}"
-             |          imagePullPolicy: IfNotPresent
-             |          name: *name
-             |          ports:
-             |            - name: app
-             |              containerPort: 8080
-             |          livenessProbe:
-             |            httpGet:
-             |              path: /health
-             |              port: 8080
-             |            initialDelaySeconds: 3
-             |            periodSeconds : 5
-             |            successThreshold: 1
-             |            failureThreshold: 3
-             |            timeoutSeconds: 1
-             |          resources:
-             |            requests:
-             |              memory: "256Mi"
-             |              cpu: "500m"
-             |            limits:
-             |              memory: "512Mi"
-             |              cpu: "1000m"
-             |          env:
-             |            - name: "${envName}"
-             |              value: "${envValue}"
-             |""".stripMargin)
-        val actualJson = Right(deployment.asJson)
-
-        actualJson shouldBe expectedYaml
-      }
-    }
-  }
-
   "cpu and memory" must "be encoded as strings with m and MiB indicators" in {
     Cpu(500).asJson shouldBe "500m".asJson
     Memory(128).asJson shouldBe "128Mi".asJson