kubes 0.4.7 → 0.5.0

data/lib/kubes/kubectl/ordering.rb

@@ -35,5 +35,47 @@ class Kubes::Kubectl
       i = index.to_s.rjust(3, "0") # pad with 0
       "#{i}-#{value}" # append name so that terms with same index get order alphabetically
     end
+
+    # kubes apply                   # {role: nil, resource: nil}
+    # kubes apply clock             # {role: "clock", resource: nil}
+    # kubes apply clock deployment  # {role: "clock", resource: "deployment"}
+    def search_expr
+      role, resource = @options[:role], @options[:resource]
+      if role && resource
+        "#{Kubes.root}/.kubes/output/#{role}/#{resource}.yaml"
+      elsif role
+        "#{Kubes.root}/.kubes/output/#{role}/*.yaml"
+      else
+        "#{Kubes.root}/.kubes/output/**/*.yaml"
+      end
+    end
+
+    def files
+      files = []
+      Dir.glob(search_expr).each do |path|
+        next unless process?(path)
+        file = path.sub("#{Kubes.root}/", '')
+        files << file
+      end
+      files
+    end
+
+    # Only considering files 2 layers deep. So:
+    #
+    #    Yes = web/deployment.yaml
+    #    No = web/deployment/dev.yaml
+    #
+    def process?(path)
+      if Kubes.kustomize?
+        File.file?(path)
+      else
+        consider?(path) && two_levels_deep?(path)
+      end
+    end
+
+    def two_levels_deep?(path)
+      rel_path = path.sub(%r{.*\.kubes/(resources|output)/},'')
+      rel_path.split('/').size == 2
+    end
   end
 end

data/lib/kubes/version.rb

@@ -1,3 +1,3 @@
 module Kubes
-  VERSION = "0.4.7"
+  VERSION = "0.5.0"
 end

data/lib/templates/base/.kubes/config.rb.tt

@@ -2,7 +2,7 @@ Kubes.configure do |config|
   config.repo = "<%= @options[:repo] %>"
   config.logger.level = "info"
   # auto-switching
-  # config.kubectl.context = "dev-services"
+  # config.kubectl.context = "dev-cluster"
   # config.kubectl.context_keep = true # keep context after switching
   # config.kubectl.exit_on_fail_for_apply  = true # whether or not continue if the kubectl command fails
   # config.kubectl.exit_on_fail_for_delete = false # whether or not continue if the kubectl command fails

data/lib/templates/base/.kubes/config/env/dev.rb

@@ -2,5 +2,5 @@
 #
 # Example:
 # Kubes.configure do |config|
-#   config.kubectl.context = "dev-services"
+#   config.kubectl.context = "dev-cluster"
 # end

data/lib/templates/base/.kubes/config/env/prod.rb

@@ -2,5 +2,5 @@
 #
 # Example:
 # Kubes.configure do |config|
-#   config.kubectl.context = "prod-services"
+#   config.kubectl.context = "prod-cluster"
 # end

data/lib/templates/dsl/.kubes/resources/web/deployment.rb

@@ -2,7 +2,7 @@ name "web"
 labels(role: "web")
 
 replicas 1 # overridden on a env basis
-image built_image # IE: user/<%= app %>:kubes-2020-06-13T19-55-16-43afc6e
+image docker_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

data/lib/templates/new/dsl/backend_config.rb

@@ -0,0 +1,10 @@
+name "<%= app %>"
+spec(
+  timeoutSec: 40,
+  connectionDraining: {
+    drainingTimeoutSec: 60,
+  },
+  sessionAffinity: {
+    affinityType: "CLIENT_IP",
+  }
+)

data/lib/templates/new/dsl/config_map.rb

@@ -0,0 +1,5 @@
+name "<%= app %>"
+data(
+  KEY1: "value1",
+  KEY2: "value2",
+)

data/lib/templates/new/dsl/daemon_set.rb

@@ -0,0 +1,11 @@
+name "<%= app %>"
+labels("app": "<%= app %>")
+updateStrategy(
+  type: "RollingUpdate",
+  rollingUpdate: {
+    maxUnavailable: 1
+  }
+)
+# annotations(
+#   "*scheduler**.alpha.kubernetes.io/critical-pod": '*'
+# )

data/lib/templates/new/dsl/deployment.rb

@@ -0,0 +1,4 @@
+name "<%= role %>"
+labels(role: "<%= role %>")
+replicas 2
+image "<%%= docker_image %>"

data/lib/templates/new/dsl/ingress.rb

@@ -0,0 +1,3 @@
+name "<%= app %>"
+serviceName "<%= app %>"
+servicePort 80

data/lib/templates/new/dsl/job.rb

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

data/lib/templates/new/dsl/managed_certificate.rb

@@ -0,0 +1,2 @@
+name "cert1"
+domains(["cert1.example.com"])

data/lib/templates/new/dsl/namespace.rb

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

data/lib/templates/new/dsl/network_policy.rb

@@ -0,0 +1,7 @@
+name "web"
+labels(app: "<%= app %>") # IE: backend
+namespace "<%= app %>"    # IE: backend
+
+matchLabels(app: "<%= app %>", role: "<%= role %>") # IE: app: backend
+fromNamespace(app: "<%= app %>") # IE: app: frontend
+fromPod(app: "<%= app %>")       # IE: backend

data/lib/templates/new/dsl/pod.rb

@@ -0,0 +1,6 @@
+name "<%= app %>"
+containers([
+  image: docker_image,
+  command: ["sleep", "3600"],
+  name: "<%= app %>",
+])

data/lib/templates/new/dsl/role.rb

@@ -0,0 +1,4 @@
+name "<%= app %>"
+apiGroups([""])
+resources(["pods"])
+verbs(["get", "watch", "list"])

data/lib/templates/new/dsl/role_binding.rb

@@ -0,0 +1,7 @@
+name "<%= app %>"
+
+subjects([
+  {kind: "User", name: "me@email.com"},
+])
+
+roleName "<%= app %>"

data/lib/templates/new/dsl/secret.rb

@@ -0,0 +1,5 @@
+name "<%= app %>"
+data(
+  username: base64("user"),
+  password: base64("pass"),
+)

data/lib/templates/new/dsl/service.rb

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

data/lib/templates/new/dsl/service_account.rb

@@ -0,0 +1 @@
+name "<%= app %>"

data/lib/templates/new/yaml/backend_config.yaml

@@ -0,0 +1,10 @@
+apiVersion: cloud.google.com/v1
+kind: BackendConfig
+metadata:
+  name: <%= app %>
+spec:
+  timeoutSec: 40
+  connectionDraining:
+    drainingTimeoutSec: 60
+  sessionAffinity:
+    affinityType: CLIENT_IP

data/lib/templates/new/yaml/config_map.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: <%= app %>
+  labels:
+    app: <%= app %>
+data:
+  KEY1: value1
+  KEY2: value2

data/lib/templates/new/yaml/daemon_set.yaml

@@ -0,0 +1,11 @@
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: <%= app %>
+  labels:
+    app: <%= app %>
+spec:
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 1

data/lib/templates/new/yaml/deployment.yaml

@@ -0,0 +1,20 @@
+test: 1
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: <%= role %>
+  labels:
+    role: <%= role %>
+spec:
+  replicas: 1  # overridden on a env basis
+  selector:
+    matchLabels:
+      role: <%= role %>
+  template:
+    metadata:
+      labels:
+        role: <%= role %>
+    spec:
+      containers:
+      - name: <%= role %>
+        image: <%%= docker_image %>

data/lib/templates/new/yaml/ingress.yaml

@@ -0,0 +1,12 @@
+apiVersion: networking.k8s.io/v1beta1
+kind: Ingress
+metadata:
+  name: <%= role %>
+spec:
+  rules:
+  - http:
+      paths:
+      - path: "/*"
+        backend:
+          serviceName: <%= role %>
+          servicePort: 80

data/lib/templates/new/yaml/job.yaml

@@ -0,0 +1,19 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: <%= app %>
+spec:
+  template:
+    spec:
+      restartPolicy: Never
+      serviceAccountName: <%= app %>
+      containers:
+      - name: <%= app %>
+        image: <%%= docker_image %>
+        command: ["uptime"] # IE: ["bin/job/migrate.sh"]
+        # envFrom:
+        # - secretRef:
+        #     name: <%= app %>
+        # - configMapRef:
+        #     name: <%= app %>
+  backoffLimit: 1

data/lib/templates/new/yaml/managed_certificate.yaml

@@ -0,0 +1,7 @@
+apiVersion: networking.gke.io/v1beta2
+kind: ManagedCertificate
+metadata:
+  name: cert1
+spec:
+  domains:
+  - cert1.example.com

data/lib/templates/new/yaml/namespace.yaml

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

data/lib/templates/new/yaml/network_policy.yaml

@@ -0,0 +1,20 @@
+apiVersion: networking.k8s.io/v1
+kind: NetworkPolicy
+metadata:
+  name: <%= role %>
+  labels:
+    app: <%= app %> # IE: backend
+  namespace: <%= app %> # IE: backend
+spec:
+  podSelector:
+    matchLabels:
+      app: <%= app %> # IE: backend
+      role: <%= role %>
+  ingress:
+  - from:
+    - namespaceSelector:
+        matchLabels:
+          app: <%= app %> # IE: frontend
+    - podSelector:
+        matchLabels:
+          app: <%= app %> # IE: backend

data/lib/templates/new/yaml/pod.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  name: <%= app %>
+spec:
+  containers:
+  - image: <%%= docker_image %>
+    command:
+    - sleep
+    - '3600'
+    name: <%= app %>

data/lib/templates/new/yaml/role.yaml

@@ -0,0 +1,13 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: <%= app %>
+rules:
+- apiGroups:
+  - ''
+  resources:
+  - pods
+  verbs:
+  - get
+  - watch
+  - list

data/lib/templates/new/yaml/role_binding.yaml

@@ -0,0 +1,11 @@
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: <%= app %>
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: <%= app %>
+subjects:
+- kind: User
+  name: me@email.com

data/lib/templates/new/yaml/secret.yaml

@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: <%= app %>
+  labels:
+    app: <%= app %>
+data:
+  username: dXNlcg==
+  password: cGFzcw==

data/lib/templates/new/yaml/service.yaml

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

data/lib/templates/new/yaml/service_account.yaml

@@ -0,0 +1,4 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: <%= app %>

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

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

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

@@ -16,4 +16,4 @@ spec:
     spec:
       containers:
       - name: web
-        image: <%%= built_image %>
+        image: <%%= docker_image %>

data/spec/kubes/cli/prune_spec.rb

@@ -4,6 +4,7 @@ describe Kubes::CLI::Prune do
     allow(prune).to receive(:sure?)
     allow(prune).to receive(:capture_items).and_return(capture)
     allow(prune).to receive(:logger).and_return(null)
+    allow(prune).to receive(:compile).and_return(null) # to avoid building Docker image
     prune
   end
   let(:null) { double(:null).as_null_object }

data/spec/kubes/compiler_spec.rb

@@ -1,5 +1,9 @@
 describe Kubes::Compiler do
-  let(:compiler) { described_class.new(options) }
+  let(:compiler) do
+    compiler = described_class.new(options)
+    allow(compiler).to receive(:write_full)
+    compiler
+  end
   let(:options) { {path: "spec/fixtures/project/.kubes/deployment.rb" } }
 
   describe "compiler" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kubes
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-28 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -286,6 +286,7 @@ files:
 - docs/_docs/dsl/resources/deployment.md
 - docs/_docs/dsl/resources/generic.md
 - docs/_docs/dsl/resources/ingress.md
+- docs/_docs/dsl/resources/job.md
 - docs/_docs/dsl/resources/managed_certificate.md
 - docs/_docs/dsl/resources/namespace.md
 - docs/_docs/dsl/resources/network_policy.md
@@ -298,6 +299,7 @@ files:
 - docs/_docs/extra-env.md
 - docs/_docs/extra-env/dsl.md
 - docs/_docs/extra-env/yaml.md
+- docs/_docs/generators.md
 - docs/_docs/helpers.md
 - docs/_docs/helpers/aws.md
 - docs/_docs/helpers/aws/iam-role.md
@@ -309,6 +311,7 @@ files:
 - docs/_docs/helpers/google/service-account.md
 - docs/_docs/intro.md
 - docs/_docs/intro/concepts.md
+- docs/_docs/intro/docker-image.md
 - docs/_docs/intro/how-kubes-works.md
 - docs/_docs/intro/install.md
 - docs/_docs/intro/ordering.md
@@ -391,6 +394,8 @@ files:
 - docs/_reference/kubes-get.md
 - docs/_reference/kubes-init.md
 - docs/_reference/kubes-logs.md
+- docs/_reference/kubes-new.md
+- docs/_reference/kubes-prune.md
 - docs/_reference/kubes-version.md
 - docs/_sass/bootstrap-overrides.scss
 - docs/_sass/buttons.scss
@@ -522,8 +527,10 @@ files:
 - lib/kubes/cli/help/completion_script.md
 - lib/kubes/cli/help/deploy.md
 - lib/kubes/cli/help/exec.md
+- lib/kubes/cli/help/new.md
 - lib/kubes/cli/init.rb
 - lib/kubes/cli/logs.rb
+- lib/kubes/cli/new.rb
 - lib/kubes/cli/prune.rb
 - lib/kubes/cli/sequence.rb
 - lib/kubes/command.rb
@@ -547,6 +554,7 @@ files:
 - lib/kubes/compiler/dsl/syntax/daemon_set.rb
 - lib/kubes/compiler/dsl/syntax/deployment.rb
 - lib/kubes/compiler/dsl/syntax/ingress.rb
+- lib/kubes/compiler/dsl/syntax/job.rb
 - lib/kubes/compiler/dsl/syntax/managed_certificate.rb
 - lib/kubes/compiler/dsl/syntax/namespace.rb
 - lib/kubes/compiler/dsl/syntax/network_policy.rb
@@ -560,6 +568,7 @@ files:
 - lib/kubes/compiler/layering.rb
 - lib/kubes/compiler/shared/custom_helpers.rb
 - lib/kubes/compiler/shared/helpers.rb
+- lib/kubes/compiler/shared/helpers/deprecated.rb
 - lib/kubes/compiler/strategy.rb
 - lib/kubes/compiler/strategy/base.rb
 - lib/kubes/compiler/strategy/dsl.rb
@@ -617,6 +626,36 @@ files:
 - 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
+- lib/templates/new/dsl/backend_config.rb
+- lib/templates/new/dsl/config_map.rb
+- lib/templates/new/dsl/daemon_set.rb
+- lib/templates/new/dsl/deployment.rb
+- lib/templates/new/dsl/ingress.rb
+- lib/templates/new/dsl/job.rb
+- lib/templates/new/dsl/managed_certificate.rb
+- lib/templates/new/dsl/namespace.rb
+- lib/templates/new/dsl/network_policy.rb
+- lib/templates/new/dsl/pod.rb
+- lib/templates/new/dsl/role.rb
+- lib/templates/new/dsl/role_binding.rb
+- lib/templates/new/dsl/secret.rb
+- lib/templates/new/dsl/service.rb
+- lib/templates/new/dsl/service_account.rb
+- lib/templates/new/yaml/backend_config.yaml
+- lib/templates/new/yaml/config_map.yaml
+- lib/templates/new/yaml/daemon_set.yaml
+- lib/templates/new/yaml/deployment.yaml
+- lib/templates/new/yaml/ingress.yaml
+- lib/templates/new/yaml/job.yaml
+- lib/templates/new/yaml/managed_certificate.yaml
+- lib/templates/new/yaml/namespace.yaml
+- lib/templates/new/yaml/network_policy.yaml
+- lib/templates/new/yaml/pod.yaml
+- lib/templates/new/yaml/role.yaml
+- lib/templates/new/yaml/role_binding.yaml
+- lib/templates/new/yaml/secret.yaml
+- lib/templates/new/yaml/service.yaml
+- lib/templates/new/yaml/service_account.yaml
 - 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