kubes 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1705ea4877f8147699b06f43bd7e4e265c45f8ce289d3f54b724b9ca304325c
-  data.tar.gz: 6473d29cf54233c203af7daec2b78d3128e7b80d78cf739af4705e9a77f8033a
+  metadata.gz: 658324c3828bd9f6ee60ad1fd925eb47ff9706fe08256b791e180b0daf3cfba0
+  data.tar.gz: 5a2cc328105e6ac7dd7847f4d92697db98827e81b214b7dc3f6b353bf78e224f
 SHA512:
-  metadata.gz: aec944078d5b6987b4b8c0f91ef4cd11cd512d2b7f6c007465b93b190c95af55bf4dcf4843d1295ae0ea08bf4b46e8db72cc5bd2bc70dfa7e2db1fd15cfd540e
-  data.tar.gz: bd470be829eb4545563e6dca41a01a9122f9e045bcbfb462267bd68f6316329f61a02e46b7fd17b9fb3bed7379589c99fc0f47a569a53aae5a2b639886d1cd00
+  metadata.gz: 307badb633d97365c4072a7e089c5a36b2abb81e761aa3a5abb46e4aaa4e3da2878023edb12cf203b817ee6aa4484b4d2d758e6f4a20b1e571fdaec75bf61ddc
+  data.tar.gz: e5d6f7434c93a73bc996fc661d026f5c601a4bd7c6680c14f0219af4561f1f7ac362370123efe381fac0538021ccb151adc308658b1f3f70c0dbff58334fed9d

data/.dockerignore

@@ -0,0 +1,4 @@
+.git
+pkg
+docs
+spec

data/CHANGELOG.md

@@ -1,8 +1,23 @@
-# Change Log
+# Changelog
 
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [0.2.5]
+- #17 cloudbuild build strategy
+
+## [0.2.4]
+- #16 google cloudbuild support & docs: add Dockerfile for kubes as a docker entrypoint
+
+## [0.2.3]
+- #15 use kubernetes default deployment strategy instead
+
+## [0.2.2]
+- #14 init template updates, dockerfile_port helper
+
+## [0.2.1]
+- #13 improve network policy dsl
+
 ## [0.2.0]
 - Initial release.
 

data/Dockerfile

@@ -0,0 +1,14 @@
+FROM ruby:2.7-alpine
+
+RUN apk add --no-cache docker
+RUN apk add --no-cache build-base ruby ruby-dev
+
+RUN wget https://storage.googleapis.com/kubernetes-release/release/v1.18.6/bin/linux/amd64/kubectl
+RUN chmod u+x kubectl && mv kubectl /bin/kubectl
+
+WORKDIR /app
+ADD . /app
+RUN bundle install
+RUN rake install
+
+ENTRYPOINT ["/usr/local/bundle/bin/kubes"]

data/docs/_docs/ci/cloudbuild.md

@@ -0,0 +1,69 @@
+---
+title: CloudBuild
+---
+
+To build kubes as a Docker image entrypoint for [Google CloudBuild Custom Builder](https://cloud.google.com/cloud-build/docs/configuring-builds/use-community-and-custom-builders).
+
+    git clone http://github.com/boltops-tools/kubes
+    cd kubes
+    gcloud builds submit --tag gcr.io/$GOOGLE_PROJECT/kubes
+
+Be sure to set GOOGLE_PROJECT to your own project id.
+
+## Example Codebuild YAML
+
+cloudbuild.yaml:
+
+```yaml
+steps:
+# Simply calling kubectl version with the CLOUDSDK_* vars will auth to the GKE cluster. Unsure why.
+- name: gcr.io/cloud-builders/kubectl
+  args: ['version']
+  env:
+  - 'CLOUDSDK_COMPUTE_REGION=$_GCP_REGION'
+  - 'CLOUDSDK_CONTAINER_CLUSTER=$_GKE_CLUSTER'
+- name: 'gcr.io/$PROJECT_ID/kubes'
+  args: ["deploy"]
+  env:
+  - 'GOOGLE_PROJECT=$PROJECT_ID' # .kubes/config.rb: config.repo
+  - 'KUBES_ENV=$_KUBES_ENV'
+  - 'KUBES_EXTRA=$_KUBES_EXTRA'
+
+substitutions:
+  _GCP_REGION: us-central1
+  _GKE_CLUSTER: dev-cluster
+  _KUBES_ENV: dev
+  _KUBES_EXTRA: ''
+options:
+    substitution_option: 'ALLOW_LOOSE'
+```
+
+## Run CloudBuild
+
+Run cloudbuild with:
+
+    gcloud builds submit --config cloudbuild.yaml
+
+Example with output:
+
+    $ gcloud builds submit --config cloudbuild.yaml
+    Starting Step #1
+    Step #1: => docker build -t gcr.io/tung-275700/demo:kubes-2020-07-25T21-13-59 -f Dockerfile .
+    Step #1: Pushed gcr.io/tung-275700/demo:kubes-2020-07-25T21-13-59 docker image.
+    Step #1: Docker push took 2s.
+    Step #1: Compiled  .kubes/resources files to .kubes/output
+    Step #1: Deploying kubes resources
+    Step #1: => kubectl apply -f .kubes/output/shared/namespace.yaml
+    Step #1: namespace/demo unchanged
+    Step #1: => kubectl apply -f .kubes/output/web/service.yaml
+    Step #1: service/web unchanged
+    Step #1: => kubectl apply -f .kubes/output/web/deployment.yaml
+    Step #1: deployment.apps/web configured
+    $
+
+## Create Extra Environments
+
+If you are using the [with_extra helper]({% link _docs/extra-env.md %}), you can create additional environments of the same app like so:
+
+    gcloud builds submit --config cloudbuild.yaml --substitutions=_KUBES_EXTRA=2
+    gcloud builds submit --config cloudbuild.yaml --substitutions=_KUBES_EXTRA=3

data/docs/_docs/config/build-strategy.md

@@ -0,0 +1,46 @@
+---
+title: Build Strategy
+---
+
+Kubes uses the `docker` to build the docker image by default. Kubes can also support an additional build strategy: gcloud.
+
+## Gcloud Build Strategy
+
+With the gcloud build strategy, you do not need docker installed locally. Google CloudBuild is used to build and push the image to a GCR registry.
+
+You must set up the [gcloud cli](https://cloud.google.com/sdk/gcloud/reference/builds/submit).  Please refer to the [gcloud sdk install docs](https://cloud.google.com/sdk/install). Kubes will call out to `gcloud builds submit` to create the Docker image.
+
+## Configure
+
+You configure gcloud as the build strategy like so:
+
+```ruby
+Kubes.configure do |config|
+  config.repo = "gcr.io/#{ENV['GOOGLE_PROJECT']}/demo"
+  config.logger.level = "info"
+  config.build_strategy = "gcloud" # <= changed to gcloud
+end
+```
+
+## Commands
+
+The kubes builds command will remain the same.
+
+    kubes docker build
+
+There is no need to run the push command, as the build command with the gcloud strategy will always push.
+
+## Deploy
+
+The deploy commands remain the same. Example:
+
+    kubes deploy web
+
+If you want to skip the `docker build` phase of the deploy, you can run:
+
+    kubes deploy web --no-build
+
+Also, kubes apply another way to skip the docker build:
+
+    kubes apply web
+

data/docs/_docs/dsl/resources/deployment.md

@@ -34,11 +34,6 @@ spec:
   selector:
     matchLabels:
       app: demo
-  strategy:
-    rollingUpdate:
-      maxSurge: 25
-      maxUnavailable: 25
-    type: RollingUpdate
   template:
     metadata:
       labels:

data/docs/_docs/dsl/resources/network_policy.md

@@ -10,9 +10,13 @@ Here's an example of a NetworkPolicy.
 .kubes/resources/web/network_policy.rb
 
 ```ruby
-name "demo-web-allow-tester"
-matchLabels(role: "web")
-fromMatchLabels(run: "tester")
+name "web"
+labels(app: "backend")
+namespace "backend"
+
+matchLabels(app: "backend", role: "web")
+fromNamespace(app: "frontend")
+fromPod(app: "backend")
 ```
 
 Produces:
@@ -23,23 +27,85 @@ Produces:
 apiVersion: networking.k8s.io/v1
 kind: NetworkPolicy
 metadata:
-  name: demo-web-allow-tester
+  name: web
+  labels:
+    app: backend
+  namespace: backend
 spec:
   podSelector:
     matchLabels:
+      app: backend
       role: web
   ingress:
   - from:
+    - namespaceSelector:
+        matchLabels:
+          app: frontend
     - podSelector:
         matchLabels:
-          run: tester
+          app: backend
+```
+
+Note, the behavior of the from is an *or* since the namespaceSelector and podSelector are separate items.
+
+## Example 2
+
+If you need more control over the ingress selectors, you can use the `from` method. Here's an example:
+
+.kubes/resources/web/network_policy.rb
+
+```ruby
+name "web"
+labels(app: "backend")
+namespace "backend"
+
+matchLabels(app: "backend", role: "web")
+from([
+  { namespaceSelector: { matchLabels: { app: "frontend" } } },
+  { namespaceSelector: { matchLabels: { app: "backend" } } }
+])
+```
+
+Produces:
+
+.kubes/output/web/network_policy.yaml
+
+```yaml
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: web
+  labels:
+    app: backend
+  namespace: backend
+spec:
+  podSelector:
+    matchLabels:
+      app: backend
+      role: web
+  ingress:
+  - from:
+    - namespaceSelector:
+        matchLabels:
+          app: frontend
+    - namespaceSelector:
+        matchLabels:
+          app: backend
 ```
 
+This will allow traffic from pods in either the frontend or backend namespaces to the backend pods.
+
 ## DSL Methods
 
 Here's a list of more common methods:
 
-* matchLabels
-* fromMatchLabels
+* fromNamespace
+* fromPod
+* fromIpBlock
+* toNamespace
+* toPod
+* toIpBlock
+* from
+* to
 
 {% include dsl/methods.md name="network_policy" %}

data/docs/_docs/helpers.md

@@ -7,8 +7,9 @@ Kubes provides some helper methods to help write Kubernetes YAML files.  Here's
 Helper | Description
 --- | ---
 built_image | Method refers to the latest Docker image built by Kubes. This spares you from having to update the image manually in the deployment resource.
-with_extra | Appends the `KUBES_ENV` value to a string if it's set. It's covered in the [Extra Env Docs]({% link _docs/extra-env.md %}).
-extra | The `KUBES_ENV` value.
+dockerfile_port	| Exposed port extracted from the Dockerfile of the project.
+extra | The `KUBES_EXTRA` value.
+with_extra | Appends the `KUBES_EXTRA` value to a string if it's set. It's covered in the [Extra Env Docs]({% link _docs/extra-env.md %}).
 
 Here's also the source code with the helpers: [helpers.rb](https://github.com/boltops-tools/kubes/blob/master/lib/kubes/compiler/shared/helpers.rb).
 

data/docs/_docs/learn/dsl/delete.md

@@ -15,6 +15,8 @@ You will be prompted to confirm before deletion. Here's out the output looks lik
     service "demo-web" deleted
     => kubectl delete -f .kubes/output/web/deployment.yaml
     deployment.apps "demo-web" deleted
+    => kubectl delete -f .kubes/output/shared/namespace.yaml
+    namespace "demo" deleted
     $
 
 Let's double-check that the resources have been deleted:

data/docs/_docs/learn/dsl/deploy.md

@@ -14,6 +14,8 @@ You'll see output like this:
     Pushed 111111111111.dkr.ecr.us-west-2.amazonaws.com/demo:kubes-2020-06-19T04-19-13 docker image.
     Docker push took 15s.
     Compiled  .kubes/resources files
+    => kubectl apply -f .kubes/output/shared/namespace.yaml
+    namespace/demo created
     => kubectl apply -f .kubes/output/web/service.yaml
     service/demo-web created
     => kubectl apply -f .kubes/output/web/deployment.yaml
@@ -34,6 +36,9 @@ Example output:
 
     $ kubes get
     => kubectl get --recursive -f .kubes/output
+    NAME             STATUS   AGE
+    namespace/demo   Active   10s
+
     NAME                       READY   UP-TO-DATE   AVAILABLE   AGE
     deployment.apps/demo-web   1/1     1            1           10s
 

data/docs/_docs/learn/dsl/new-project.md

@@ -17,6 +17,7 @@ Let's generate a starter project:
           create  .kubes/config/env/dev.rb
           create  .kubes/config/env/prod.rb
           create  .kubes/resources/base/all.rb
+          create  .kubes/resources/shared/namespace.rb
           create  .kubes/resources/web/deployment.rb
           create  .kubes/resources/web/deployment/dev.rb
           create  .kubes/resources/web/deployment/prod.rb

data/docs/_docs/learn/dsl/review-project.md

@@ -4,7 +4,18 @@ title: Review Project
 
 Let's review the resources.
 
-## Deployment Resource
+## Namespace
+
+We'll create a namespace for the app resources:
+
+.kubes/resources/shared/namespace.rb
+
+```ruby
+name "demo"
+labels(app: "demo")
+```
+
+## Deployment
 
 The `web/deployment.rb` file is a little more interesting:
 
@@ -21,7 +32,7 @@ image built_image # IE: user/demo:kubes-2020-06-13T19-55-16-43afc6e
 
 The DSL form is more concise than the YAML form.  Also, notice the use of the `built_image` helper. The `built_image` is a kubes helper method that refers to the latest Docker image built. This spares you from updating the image manually.
 
-## Base Resource
+## Base Folder
 
 Also let's check the files in the base folder.
 

data/docs/_docs/learn/dsl/update.md

@@ -6,7 +6,7 @@ Let's update the app. In this case, we don't need to update the Docker image, so
 
     kubes apply
 
-Here's what the output looks like:
+Here's what the output looks like.  Note, the namespace is not shown for conciseness.
 
     $ kubes apply
     Compiled  .kubes/resources files

data/docs/_docs/learn/yaml/delete.md

@@ -15,6 +15,8 @@ You will be prompted to confirm before deletion. Here's out the output looks lik
     service "demo-web" deleted
     => kubectl delete -f .kubes/output/web/deployment.yaml
     deployment.apps "demo-web" deleted
+    => kubectl delete -f .kubes/output/shared/namespace.yaml
+    namespace "demo" deleted
     $
 
 Let's double-check that the resources have been deleted:

data/docs/_docs/learn/yaml/deploy.md

@@ -14,6 +14,8 @@ You'll see output like this:
     Pushed 111111111111.dkr.ecr.us-west-2.amazonaws.com/demo:kubes-2020-06-19T04-19-13 docker image.
     Docker push took 15s.
     Compiled  .kubes/resources files
+    => kubectl apply -f .kubes/output/shared/namespace.yaml
+    namespace/demo created
     => kubectl apply -f .kubes/output/web/service.yaml
     service/demo-web created
     => kubectl apply -f .kubes/output/web/deployment.yaml
@@ -34,6 +36,9 @@ Example output:
 
     $ kubes get
     => kubectl get --recursive -f .kubes/output
+    NAME             STATUS   AGE
+    namespace/demo   Active   7s
+
     NAME                       READY   UP-TO-DATE   AVAILABLE   AGE
     deployment.apps/demo-web   1/1     1            1           7s
 

data/docs/_docs/learn/yaml/new-project.md

@@ -19,6 +19,7 @@ Let's generate a starter project:
           create  .kubes/config/env/prod.rb
           create  .kubes/resources/base/all.yaml
           create  .kubes/resources/base/deployment.yaml
+          create  .kubes/resources/shared/namespace.yaml
           create  .kubes/resources/web/deployment.yaml
           create  .kubes/resources/web/deployment/dev.yaml
           create  .kubes/resources/web/deployment/prod.yaml

data/docs/_docs/learn/yaml/review-project.md

@@ -4,7 +4,22 @@ title: Review Project
 
 Let's review the resources.
 
-## Deployment Resource
+## Namespace
+
+We'll create a namespace for the app resources:
+
+.kubes/resources/shared/namespace.yaml
+
+```yaml
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: demo
+  labels:
+    app: demo
+```
+
+## Deployment
 
 The `web/deployment.yaml` file is a little more interesting:
 
@@ -14,7 +29,7 @@ The `web/deployment.yaml` file is a little more interesting:
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: demo-web
+  name: web
   labels:
     role: web
 spec:
@@ -22,24 +37,19 @@ spec:
   selector:
     matchLabels:
       role: web
-  strategy:
-    rollingUpdate:
-      maxSurge: 25
-      maxUnavailable: 25
-    type: RollingUpdate
   template:
     metadata:
       labels:
         role: web
     spec:
       containers:
-      - name: demo
+      - name: web
         image: <%= built_image %>
 ```
 
 Notice the `<%= built_image %>`.  Kubes processes the YAML files with ERB templating and replaces these tags.  The `built_image` is a kubes helper method that refers to the latest Docker image built by Kubes. This spares you updating the image manually.
 
-## Base Resource
+## Base Folder
 
 Also let's check the files in the base folder.
 
@@ -47,7 +57,7 @@ Also let's check the files in the base folder.
 
 ```yaml
 metadata:
-  namespace: default
+  namespace: demo
 ```
 
 .kubes/resources/base/deployment.yaml
@@ -68,6 +78,8 @@ spec:
 
 The base folder files are processed first as a part of [Kubes Layering]({% link _docs/layering.md %}). This allows you to define common fields and keep your code DRY.
 
+The `all.yaml` means all resources will use the demo namespace.  The `deployment.yaml` adds common labels to all deployment resource kinds.
+
 ## Service Resource
 
 Next, let's look at `service.yaml`
@@ -78,20 +90,19 @@ Next, let's look at `service.yaml`
 apiVersion: v1
 kind: Service
 metadata:
-  name: demo-web
+  name: web
   labels:
-    app: demo
-  namespace: default
+    role: web
 spec:
   ports:
   - port: 80
     protocol: TCP
-    targetPort: 8080
+    targetPort: <%= dockerfile_port %>
   selector:
-    app: demo
+    role: web
   type: ClusterIP
 ```
 
-There's no use of ERB templating here.
+The `dockerfile_port` helper returns the EXPOSE port in the Dockerfile. This spares you updating this manually, you only have to update the Dockerfile.
 
 Next, we'll deploy the app.

data/docs/_docs/learn/yaml/update.md

@@ -6,7 +6,7 @@ Let's update the app. In this case, we don't need to update the Docker image, so
 
     kubes apply
 
-Here's what the output looks like:
+Here's what the output looks like. Note, the namespace is not shown for conciseness.
 
     $ kubes apply
     Compiled  .kubes/resources files

data/docs/_docs/yaml.md

@@ -30,11 +30,6 @@ spec:
   selector:
     matchLabels:
       app: demo
-  strategy:
-    rollingUpdate:
-      maxSurge: 25
-      maxUnavailable: 25
-    type: RollingUpdate
   template:
     metadata:
       labels:

data/docs/_includes/learn/review.md

@@ -15,7 +15,7 @@ This is where the `--repo` from `kubes init` got saved.  The other options are c
 
 ## Dockerfie
 
-The `Dockerfile` is a simple starter example that just runs nginx.
+The `Dockerfile` is a simple starter example that just runs nginx
 
 Dockerfile:
 
@@ -23,3 +23,5 @@ Dockerfile:
     FROM nginx
     EXPOSE 80
     CMD ["nginx", "-g", "daemon off;"]
+
+Note: If your project already has a Dockerfile, kubes will use that instead of generating a starter one.

data/docs/_includes/sidebar.html

@@ -56,6 +56,7 @@
           <li><a href="{% link _docs/config/docker.md %}">Docker</a></li>
           <li><a href="{% link _docs/config/env.md %}">Env</a></li>
           <li><a href="{% link _docs/config/kubectl.md %}">Kubectl</a></li>
+          <li><a href="{% link _docs/config/build-strategy.md %}">Build Strategy</a></li>
         </ul>
       </li>
       <li><a href="{% link _docs/yaml.md %}">YAML</a></li>
@@ -93,6 +94,11 @@
       </li>
       <li><a href="{% link _docs/kustomize.md %}">Kustomize Support</a></li>
       <li><a href="{% link _docs/auto-context.md %}">Auto Context</a></li>
+      <li>CI/CD
+        <ul>
+          <li><a href="{% link _docs/ci/cloudbuild.md %}">CloudBuild</a></li>
+        </ul>
+      </li>
       <li>More
         <ul class="more">
           <li><a href="{% link support.md %}">Support</a></li>

data/lib/kubes/cli/build.rb

@@ -1,8 +1,8 @@
 class Kubes::CLI
   class Build < Base
     def run
-      Kubes::Docker::Build.new(@options).run
-      Kubes::Docker::Push.new(@options).run
+      Kubes::Docker.new(@options, "build").run
+      Kubes::Docker.new(@options, "push").run
     end
   end
 end

data/lib/kubes/cli/docker.rb

@@ -4,7 +4,7 @@ class Kubes::CLI
     long_desc Help.text("docker:build")
     option :push, type: :boolean, default: false
     def build
-      builder = Kubes::Docker::Build.new(options)
+      builder = Kubes::Docker.new(options, "build")
       builder.run
       push if options[:push]
     end
@@ -13,7 +13,7 @@ class Kubes::CLI
     long_desc Help.text("docker:push")
     option :push, type: :boolean, default: false
     def push
-      pusher = Kubes::Docker::Push.new(options)
+      pusher = Kubes::Docker.new(options, "push")
       pusher.run
     end
   end

data/lib/kubes/cli/init.rb

@@ -49,7 +49,7 @@ class Kubes::CLI
       ignores = %w[
         .kubes/output
         .kubes/state
-      ]
+      ].map {|l| "#{l}\n"} # the readlines will have lines with \n so keep consistent for processing
       if File.exist?(".gitignore")
         lines = IO.readlines(".gitignore")
         if lines.detect { |l| l.include?('.kubes/output') }
@@ -61,7 +61,7 @@ class Kubes::CLI
         lines = ignores
       end
 
-      text = lines.join("\n") + "\n"
+      text = lines.join('')
       IO.write(".gitignore", text)
       puts "Updated .gitignore"
     end

data/lib/kubes/compiler/dsl/core/helpers.rb

@@ -1,4 +1,19 @@
 module Kubes::Compiler::Dsl::Core
   module Helpers
+    def dockerfile_port
+      path = "#{Kubes.root}/Dockerfile"
+      File.exist?(path) ? parse_for_dockerfile_port(path) : 80
+    end
+
+  private
+    def parse_for_dockerfile_port(path)
+      lines = IO.read(path).split("\n")
+      expose_line = lines.find { |l| l =~ /^EXPOSE / }
+      if expose_line
+        md = expose_line.match(/EXPOSE (\d+)/)
+        port = md[1] if md
+      end
+      port ? port.to_i : 80
+    end
   end
 end

data/lib/kubes/compiler/dsl/syntax/deployment.rb

@@ -82,6 +82,11 @@ module Kubes::Compiler::Dsl::Syntax
     end
 
     def default_strategy
+      return unless maxUnavailable || maxSurge
+
+      maxSurge = maxUnavailable if maxUnavailable && !maxSurge
+      maxUnavailable = maxSurge if !maxUnavailable && maxSurge
+
       {
         rollingUpdate: {
           maxSurge: maxSurge,
@@ -91,14 +96,6 @@ module Kubes::Compiler::Dsl::Syntax
       }
     end
 
-    def default_maxSurge
-      25
-    end
-
-    def default_maxUnavailable
-      25
-    end
-
     def default_template
       {
         metadata: templateMetadata,

data/lib/kubes/compiler/dsl/syntax/network_policy.rb

@@ -5,8 +5,16 @@ module Kubes::Compiler::Dsl::Syntax
            :podSelector,  # <Object> -required-
            :policyTypes   # <[]string>
 
-    fields "fromMatchLabels:hash",
-           "matchLabels:hash"
+    fields "matchLabels:hash"
+
+    fields "fromNamespace:hash",
+           "fromPod:hash",
+           "fromIpBlock:hash",
+           "toNamespace:hash",
+           "toPod:hash",
+           "toIpBlock:hash",
+           :from,
+           :to
 
     def default_apiVersion
       "networking.k8s.io/v1"
@@ -14,17 +22,26 @@ module Kubes::Compiler::Dsl::Syntax
 
     def default_spec
       {
-        podSelector: {
-          matchLabels: matchLabels
-        },
-        ingress: [
-          from: [
-            podSelector: {
-              matchLabels: fromMatchLabels
-            }
-          ]
-        ]
+        podSelector: { matchLabels: matchLabels },
+        ingress: [from: from],
+        egress: [to: to],
       }
     end
+
+    def default_from
+      [
+        { namespaceSelector: { matchLabels: fromNamespace } },
+        { podSelector: { matchLabels: fromPod } },
+        { ipBlock: fromIpBlock }
+      ]
+    end
+
+    def default_to
+      [
+        { namespaceSelector: { matchLabels: toNamespace } },
+        { podSelector: { matchLabels: toPod } },
+        { ipBlock: toIpBlock }
+      ]
+    end
   end
 end

data/lib/kubes/compiler/shared/helpers.rb

@@ -20,7 +20,8 @@ module Kubes::Compiler::Shared
     end
 
     def extra
-      ENV['KUBES_EXTRA']
+      extra = ENV['KUBES_EXTRA']
+      extra&.strip&.empty? ? nil : extra # if blank string then also return nil
     end
 
     def base64(v)

data/lib/kubes/config.rb

@@ -35,6 +35,8 @@ module Kubes
 
       config.repo = nil # expected to be set by .kubes/config.rb
 
+      config.build_strategy = "docker" # IE: docker or gcloud
+
       config
     end
 

data/lib/kubes/docker.rb

@@ -0,0 +1,19 @@
+module Kubes
+  class Docker
+    def initialize(options, name)
+      @options = options
+      @name = name
+    end
+
+    def run
+      strategy = strategy_class.new(@options, @name) # @name: docker or push
+      strategy.run
+    end
+
+    def strategy_class
+      strategy = Kubes.config.build_strategy.to_s.camelize # IE: Docker or Gcloud
+      klass_name = "Kubes::Docker::Strategy::#{@name.camelize}::#{strategy}"
+      klass_name.constantize
+    end
+  end
+end

data/lib/kubes/docker/strategy/build/base.rb

@@ -0,0 +1,24 @@
+module Kubes::Docker::Strategy::Build
+  class Base
+    extend Memoist
+    include Kubes::Docker::Strategy::Utils
+
+    def initialize(options, name)
+      @options, @name = options, name
+    end
+
+    def run
+      reserve_image_name
+      check_dockerfile!
+      perform
+      store_image_name
+    end
+
+    def check_dockerfile!
+      # Dockerfile is also used in args/default.rb, will have to combine if Dockerfile is made configurable
+      return if File.exist?("Dockerfile")
+      logger.error "ERROR: The Dockerfile does not exist. Cannot build the docker image without a Dockerfile".color(:red)
+      exit 1
+    end
+  end
+end

data/lib/kubes/docker/strategy/build/docker.rb

@@ -0,0 +1,11 @@
+module Kubes::Docker::Strategy::Build
+  class Docker < Base
+    def perform
+      params = args.flatten.join(' ')
+      command = "docker build #{params}"
+      run_hooks "build" do
+        sh(command)
+      end
+    end
+  end
+end

data/lib/kubes/docker/strategy/build/gcloud.rb

@@ -0,0 +1,10 @@
+module Kubes::Docker::Strategy::Build
+  class Gcloud < Base
+    def perform
+      command = "gcloud builds submit --tag #{@@image_name}"
+      run_hooks "build" do
+        sh(command)
+      end
+    end
+  end
+end

data/lib/kubes/docker/strategy/hooks.rb

@@ -0,0 +1,9 @@
+module Kubes::Docker::Strategy
+  module Hooks
+    def run_hooks(name, &block)
+      hooks = Kubes::Hooks::Builder.new(name, "#{Kubes.root}/.kubes/config/docker/hooks.rb")
+      hooks.build # build hooks
+      hooks.run_hooks(&block)
+    end
+  end
+end

data/lib/kubes/docker/{base.rb → strategy/image_name.rb}

@@ -1,36 +1,6 @@
-module Kubes::Docker
-  class Base
+module Kubes::Docker::Strategy
+  module ImageName
     extend Memoist
-    include Kubes::Logging
-    include Kubes::Util::Sh
-
-    def initialize(options={})
-      @options = options
-      @name = self.class.name.split('::').last.underscore
-    end
-
-    def run_hooks(name, &block)
-      hooks = Kubes::Hooks::Builder.new(name, "#{Kubes.root}/.kubes/config/docker/hooks.rb")
-      hooks.build # build hooks
-      hooks.run_hooks(&block)
-    end
-
-    def args
-      # base at end in case of redirection. IE: command > /path
-      custom.args + default.args
-    end
-
-    def custom
-      custom = Kubes::Args::Custom.new(@name, "#{Kubes.root}/.kubes/config/docker/args.rb")
-      custom.build
-      custom
-    end
-    memoize :custom
-
-    def default
-      Args::Default.new(@name, image_name, @options)
-    end
-    memoize :default
 
     @@image_name = nil
     def reserve_image_name
@@ -84,5 +54,22 @@ module Kubes::Docker
       @git_sha = `cd #{Kubes.root} && git rev-parse --short HEAD`
       @git_sha.strip!
     end
+
+    def args
+      # base at end in case of redirection. IE: command > /path
+      custom.args + default.args
+    end
+
+    def custom
+      custom = Kubes::Args::Custom.new(@name, "#{Kubes.root}/.kubes/config/docker/args.rb")
+      custom.build
+      custom
+    end
+    memoize :custom
+
+    def default
+      Kubes::Docker::Args::Default.new(@name, image_name, @options)
+    end
+    memoize :default
   end
 end

data/lib/kubes/docker/strategy/push/base.rb

@@ -0,0 +1,9 @@
+module Kubes::Docker::Strategy::Push
+  class Base
+    include Kubes::Docker::Strategy::Utils
+
+    def initialize(options, name)
+      @options, @name = options, name
+    end
+  end
+end

data/lib/kubes/docker/{push.rb → strategy/push/docker.rb}

@@ -1,8 +1,5 @@
-module Kubes::Docker
-  class Push < Base
-    include Kubes::Logging
-    include Kubes::Util::Time
-
+module Kubes::Docker::Strategy::Push
+  class Docker < Base
     def run
       update_auth_token
       start_time = Time.now

data/lib/kubes/docker/strategy/push/gcloud.rb

@@ -0,0 +1,9 @@
+module Kubes::Docker::Strategy::Push
+  class Gcloud < Base
+    def run
+      run_hooks "push" do
+        # noop, gcloud builds submit already pushes the image
+      end
+    end
+  end
+end

data/lib/kubes/docker/strategy/utils.rb

@@ -0,0 +1,9 @@
+module Kubes::Docker::Strategy
+  module Utils
+    include Kubes::Logging
+    include Kubes::Util::Sh
+    include Kubes::Util::Time
+    include Kubes::Docker::Strategy::ImageName
+    include Kubes::Docker::Strategy::Hooks
+  end
+end

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.2.0"
+  VERSION = "0.2.5"
 end

data/lib/templates/dsl/.kubes/resources/base/all.rb.tt

@@ -1,2 +1,2 @@
-namespace "default"
+namespace "<%= app %>"
 labels(app: "<%= app %>")

data/lib/templates/dsl/.kubes/resources/shared/namespace.rb.tt

@@ -0,0 +1,2 @@
+name "<%= app %>"
+labels(app: "<%= app %>")

data/lib/templates/dsl/.kubes/resources/web/{deployment.rb.tt → deployment.rb}

@@ -1,7 +1,10 @@
-name "<%= app %>-web"
+name "web"
 labels(role: "web")
 
 replicas 1
 image built_image # IE: user/<%= app %>:kubes-2020-06-13T19-55-16-43afc6e
 
+# revisionHistoryLimit 1 # uncomment to reduce old ReplicaSets, default is 10 https://bit.ly/3hqrzyP
+# maxUnavailable 25
+
 # More docs: kubes.guru/docs/dsl/deployment/

data/lib/templates/dsl/.kubes/resources/web/{service.rb.tt → service.rb}

@@ -1,8 +1,8 @@
-name "<%= app %>-web"
+name "web"
 labels(role: "web")
 
 # Optional since default port is 80
 # port 80
-# targetPort 80
+targetPort dockerfile_port # expose port in Dockerfile
 
 # More docs: kubes.guru/docs/dsl/service/

data/lib/templates/yaml/.kubes/resources/base/all.yaml.tt

@@ -1,2 +1,2 @@
 metadata:
-  namespace: default
+  namespace: <%= app %>

data/lib/templates/yaml/.kubes/resources/shared/namespace.yaml.tt

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: <%= app %>
+  labels:
+    app: <%= app %>

data/lib/templates/yaml/.kubes/resources/web/deployment.yaml.tt

@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: <%= app %>-web
+  name: web
   labels:
     role: web
 spec:
@@ -9,16 +9,11 @@ spec:
   selector:
     matchLabels:
       role: web
-  strategy:
-    rollingUpdate:
-      maxSurge: 25
-      maxUnavailable: 25
-    type: RollingUpdate
   template:
     metadata:
       labels:
         role: web
     spec:
       containers:
-      - name: <%= app %>-web
+      - name: web
         image: <%%= built_image %>

data/lib/templates/yaml/.kubes/resources/web/service.yaml.tt

@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: <%= app %>-web
+  name: web
   labels:
     role: web
 spec:
   ports:
   - port: 80
     protocol: TCP
-    targetPort: 80
+    targetPort: <%%= dockerfile_port %>
   selector:
     role: web
   type: ClusterIP

data/spec/fixtures/syntax/network_policy.rb

@@ -1,3 +1,3 @@
 name "demo-web-allow-tester"
 matchLabels(role: "web")
-fromMatchLabels(run: "tester")
+fromPod(run: "tester")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -214,9 +214,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".dockerignore"
 - ".gitignore"
 - ".rspec"
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -231,7 +233,9 @@ files:
 - docs/Rakefile
 - docs/_config.yml
 - docs/_docs/auto-context.md
+- docs/_docs/ci/cloudbuild.md
 - docs/_docs/config.md
+- docs/_docs/config/build-strategy.md
 - docs/_docs/config/docker.md
 - docs/_docs/config/env.md
 - docs/_docs/config/kubectl.md
@@ -510,10 +514,17 @@ files:
 - lib/kubes/completer/script.sh
 - lib/kubes/config.rb
 - lib/kubes/core.rb
+- lib/kubes/docker.rb
 - lib/kubes/docker/args/default.rb
-- lib/kubes/docker/base.rb
-- lib/kubes/docker/build.rb
-- lib/kubes/docker/push.rb
+- lib/kubes/docker/strategy/build/base.rb
+- lib/kubes/docker/strategy/build/docker.rb
+- lib/kubes/docker/strategy/build/gcloud.rb
+- lib/kubes/docker/strategy/hooks.rb
+- lib/kubes/docker/strategy/image_name.rb
+- lib/kubes/docker/strategy/push/base.rb
+- lib/kubes/docker/strategy/push/docker.rb
+- lib/kubes/docker/strategy/push/gcloud.rb
+- lib/kubes/docker/strategy/utils.rb
 - lib/kubes/hooks/builder.rb
 - lib/kubes/hooks/dsl.rb
 - lib/kubes/kubectl.rb
@@ -536,12 +547,14 @@ files:
 - lib/templates/base/.kubes/config/env/prod.rb
 - lib/templates/docker/Dockerfile
 - lib/templates/dsl/.kubes/resources/base/all.rb.tt
-- lib/templates/dsl/.kubes/resources/web/deployment.rb.tt
+- lib/templates/dsl/.kubes/resources/shared/namespace.rb.tt
+- lib/templates/dsl/.kubes/resources/web/deployment.rb
 - lib/templates/dsl/.kubes/resources/web/deployment/dev.rb
 - lib/templates/dsl/.kubes/resources/web/deployment/prod.rb
-- lib/templates/dsl/.kubes/resources/web/service.rb.tt
+- lib/templates/dsl/.kubes/resources/web/service.rb
 - lib/templates/yaml/.kubes/resources/base/all.yaml.tt
 - lib/templates/yaml/.kubes/resources/base/deployment.yaml.tt
+- lib/templates/yaml/.kubes/resources/shared/namespace.yaml.tt
 - lib/templates/yaml/.kubes/resources/web/deployment.yaml.tt
 - lib/templates/yaml/.kubes/resources/web/deployment/dev.yaml
 - lib/templates/yaml/.kubes/resources/web/deployment/prod.yaml

data/lib/kubes/docker/build.rb

@@ -1,33 +0,0 @@
-require 'open4'
-
-module Kubes::Docker
-  class Build < Base
-    def run
-      reserve_image_name
-      build
-      store_image_name
-    end
-
-    def build
-      # Dockerfile is also used in args/default.rb, will have to combine if Dockerfile is made configurable
-      unless File.exist?("Dockerfile")
-        logger.error "ERROR: The Dockerfile does not exist. Cannot build the docker image without a Dockerfile".color(:red)
-        exit 1
-      end
-      params = args.flatten.join(' ')
-      command = "docker build #{params}"
-      run_hooks "build" do
-        # sh(command)
-        spawn(command)
-      end
-    end
-
-    def spawn(command, stdin: '', stdout: STDOUT, stderr: STDERR)
-      Open4::spawn(
-          command,
-          stdin: stdin,
-          stdout: stdout,
-          stderr: stderr)
-    end
-  end
-end