yipeeio · palemtnrider · Feb 24, 2020 · Mar 1, 2020 · Mar 1, 2020 · Mar 2, 2020
diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ spec:
   type: ClusterIP
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: joomla
@@ -139,7 +139,7 @@ spec:
   revisionHistoryLimit: 2
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mariadb
@@ -292,8 +292,8 @@ the repo.  By default this will produce three images:
 
 ## Run with Locally Built Images
 - push the images to your kubernetes cluster
-- modify _yipee.yaml_ to reference those images
-- apply the modified yipee.yaml
+- for the editor, modify the kustomization.yaml and update the imaage settings
+- run `kubecel apply -k .`
 
 # Integration with other tools
 We've exposed an API that allows you to post your YAML file then open the browser with that file loaded.  This is to aid integration with things like `kubectl edit`

diff --git a/api/test/k8sapi.js b/api/test/k8sapi.js
@@ -178,7 +178,7 @@ const deploymentList = {
         },
         "annotations": {
           "deployment.kubernetes.io/revision": "1",
-          "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"extensions/v1beta1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"yipee.io.lastModelUpdate\":\"2018-06-13T22:27:39.282Z\",\"yipee.io.modelURL\":\"https://app.yipee.io/catalog\"},\"name\":\"nginx-deployment\",\"namespace\":\"simple\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":2,\"rollbackTo\":{\"revision\":0},\"selector\":{\"matchLabels\":{\"component\":\"nginx-deployment\",\"name\":\"simple\",\"yipee.io/nginx-svc\":\"generated\"}},\"strategy\":{\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"component\":\"nginx-deployment\",\"name\":\"simple\",\"yipee.io/nginx-svc\":\"generated\"}},\"spec\":{\"containers\":[{\"image\":\"nginx\",\"name\":\"nginx-container\",\"ports\":[{\"containerPort\":80,\"protocol\":\"TCP\"}]}]}}}}\n",
+          "kubectl.kubernetes.io/last-applied-configuration": "{\"apiVersion\":\"apps/v1\",\"kind\":\"Deployment\",\"metadata\":{\"annotations\":{\"yipee.io.lastModelUpdate\":\"2018-06-13T22:27:39.282Z\",\"yipee.io.modelURL\":\"https://app.yipee.io/catalog\"},\"name\":\"nginx-deployment\",\"namespace\":\"simple\"},\"spec\":{\"replicas\":1,\"revisionHistoryLimit\":2,\"rollbackTo\":{\"revision\":0},\"selector\":{\"matchLabels\":{\"component\":\"nginx-deployment\",\"name\":\"simple\",\"yipee.io/nginx-svc\":\"generated\"}},\"strategy\":{\"type\":\"RollingUpdate\"},\"template\":{\"metadata\":{\"labels\":{\"component\":\"nginx-deployment\",\"name\":\"simple\",\"yipee.io/nginx-svc\":\"generated\"}},\"spec\":{\"containers\":[{\"image\":\"nginx\",\"name\":\"nginx-container\",\"ports\":[{\"containerPort\":80,\"protocol\":\"TCP\"}]}]}}}}\n",
           "yipee.io.lastModelUpdate": "2018-06-13T22:27:39.282Z",
           "yipee.io.modelURL": "https://app.yipee.io/catalog"
         }

diff --git a/api/test/testAssets/simpleK8sApp.yaml b/api/test/testAssets/simpleK8sApp.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: one

diff --git a/build.sh b/build.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-TAG=2.0
+TAG=2.2
 
 ORG=$1 
 if [ -z "$ORG" ];

diff --git a/converter/schemata/master-standalone-strict/cronjoblist.json b/converter/schemata/master-standalone-strict/cronjoblist.json
@@ -169,7 +169,7 @@
                       }, 
                       "manualSelector": {
                         "type": "boolean", 
-                        "description": "manualSelector controls generation of pod labels and pod selectors. Leave `manualSelector` unset unless you are certain what you are doing. When false or unset, the system pick labels unique to this job and appends those labels to the pod template.  When true, the user is responsible for picking unique labels and specifying the selector.  Failure to pick a unique label may cause this and other jobs to not function correctly.  However, You may see `manualSelector=true` in jobs that were created with the old `extensions/v1beta1` API. More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/#specifying-your-own-pod-selector"
+                        "description": "manualSelector controls generation of pod labels and pod selectors. Leave `manualSelector` unset unless you are certain what you are doing. When false or unset, the system pick labels unique to this job and appends those labels to the pod template.  When true, the user is responsible for picking unique labels and specifying the selector.  Failure to pick a unique label may cause this and other jobs to not function correctly.  However, You may see `manualSelector=true` in jobs that were created with the old `batch/v1beta1` API. More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/#specifying-your-own-pod-selector"
                       }, 
                       "selector": {
                         "additionalProperties": false, 

diff --git a/converter/schemata/master-standalone-strict/jobspec.json b/converter/schemata/master-standalone-strict/jobspec.json
@@ -16,7 +16,7 @@
     }, 
     "manualSelector": {
       "type": "boolean", 
-      "description": "manualSelector controls generation of pod labels and pod selectors. Leave `manualSelector` unset unless you are certain what you are doing. When false or unset, the system pick labels unique to this job and appends those labels to the pod template.  When true, the user is responsible for picking unique labels and specifying the selector.  Failure to pick a unique label may cause this and other jobs to not function correctly.  However, You may see `manualSelector=true` in jobs that were created with the old `extensions/v1beta1` API. More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/#specifying-your-own-pod-selector"
+      "description": "manualSelector controls generation of pod labels and pod selectors. Leave `manualSelector` unset unless you are certain what you are doing. When false or unset, the system pick labels unique to this job and appends those labels to the pod template.  When true, the user is responsible for picking unique labels and specifying the selector.  Failure to pick a unique label may cause this and other jobs to not function correctly.  However, You may see `manualSelector=true` in jobs that were created with the old `batch/v1` API. More info: https://kubernetes.io/docs/concepts/workloads/controllers/jobs-run-to-completion/#specifying-your-own-pod-selector"
     }, 
     "selector": {
       "additionalProperties": false, 

diff --git a/converter/src/k8scvt/flat_to_k8s.clj b/converter/src/k8scvt/flat_to_k8s.clj
@@ -1287,7 +1287,7 @@
   (remove! ?dspec)
   (insert! {:type :deployment
             :id (:id ?dspec)
-            :apiVersion "extensions/v1beta1" :kind "Deployment"
+            :apiVersion "apps/v1" :kind "Deployment"
             :metadata (assign-top-labels ?dspec)
             :spec (dissoc ?dspec :name :type :labels :top-labels
                           :claim-templates :id :__id)}))
@@ -1300,7 +1300,7 @@
   (remove! ?dsspec)
   (insert! {:type :daemonSet
             :id (:id ?dsspec)
-            :apiVersion "extensions/v1beta1" :kind "DaemonSet"
+            :apiVersion "apps/v1" :kind "DaemonSet"
             :metadata (assign-top-labels ?dsspec)
             :spec (dissoc ?dsspec :name :type :labels :top-labels :id :__id)}))
 

diff --git a/converter/test/k8scvt/testdata/DeploymentJoomla.yaml b/converter/test/k8scvt/testdata/DeploymentJoomla.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: joomla

diff --git a/converter/test/k8scvt/testdata/InstantiatedJoomla.yaml b/converter/test/k8scvt/testdata/InstantiatedJoomla.yaml
@@ -1,6 +1,6 @@
 ---
 # Source: joomla2/templates/DeploymentJoomla.yaml
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: joomla

diff --git a/converter/test/k8scvt/testdata/InstantiatedJoomla2.yaml b/converter/test/k8scvt/testdata/InstantiatedJoomla2.yaml
@@ -1,6 +1,6 @@
 ---
 # Source: joomla2/templates/DeploymentJoomla.yaml
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: joomla

diff --git a/converter/test/k8scvt/testdata/InstantiatedSd.yaml b/converter/test/k8scvt/testdata/InstantiatedSd.yaml
@@ -1,4 +1,4 @@
 ---
 # Source: sd2/templates/DeploymentRacket.yaml
-{"apiVersion":"extensions/v1beta1","kind":"Deployment","metadata":{"name":"racket"},"spec":{"replicas":1,"rollbackTo":{"revision":0},"revisionHistoryLimit":2,"selector":{"matchLabels":{"name":"racket","component":"racket"}},"strategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":1},"type":"RollingUpdate"},"template":{"metadata":{"labels":{"name":"racket","component":"racket"}},"spec":{"containers":[{"image":"jackfirth/racket:6.5-onbuild-test","name":"racket","ports":[{"containerPort":80,"protocol":"TCP"}]}],"restartPolicy":"Always"}}}}
+{"apiVersion":"apps/v1","kind":"Deployment","metadata":{"name":"racket"},"spec":{"replicas":1,"rollbackTo":{"revision":0},"revisionHistoryLimit":2,"selector":{"matchLabels":{"name":"racket","component":"racket"}},"strategy":{"rollingUpdate":{"maxSurge":1,"maxUnavailable":1},"type":"RollingUpdate"},"template":{"metadata":{"labels":{"name":"racket","component":"racket"}},"spec":{"containers":[{"image":"jackfirth/racket:6.5-onbuild-test","name":"racket","ports":[{"containerPort":80,"protocol":"TCP"}]}],"restartPolicy":"Always"}}}}
 
diff --git a/converter/test/k8scvt/testdata/badbday.yml b/converter/test/k8scvt/testdata/badbday.yml
@@ -81,7 +81,7 @@ spec:
   volumeName: redmine-public
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: nginx
@@ -129,7 +129,7 @@ spec:
           claimName: redmine-publicclaim
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: db
@@ -174,7 +174,7 @@ spec:
           claimName: mysql-dataclaim
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: redmine

diff --git a/converter/test/k8scvt/testdata/badcomposite.tgz b/converter/test/k8scvt/testdata/badcomposite.tgz
diff --git a/converter/test/k8scvt/testdata/bday4.yml b/converter/test/k8scvt/testdata/bday4.yml
@@ -75,7 +75,7 @@ spec:
   volumeName: redmine-public
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: nginx
@@ -124,7 +124,7 @@ spec:
           claimName: redmine-publicclaim
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: db
@@ -169,7 +169,7 @@ spec:
           claimName: mysql-dataclaim
 
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: redmine

diff --git a/converter/test/k8scvt/testdata/bdeployment.yaml b/converter/test/k8scvt/testdata/bdeployment.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: one

diff --git a/converter/test/k8scvt/testdata/bdeployment2.yaml b/converter/test/k8scvt/testdata/bdeployment2.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: one

diff --git a/converter/test/k8scvt/testdata/casf.yaml b/converter/test/k8scvt/testdata/casf.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: one

diff --git a/converter/test/k8scvt/testdata/complete-demo.yaml b/converter/test/k8scvt/testdata/complete-demo.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: carts-db
@@ -54,7 +54,7 @@ spec:
   selector:
     name: carts-db
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: carts
@@ -113,7 +113,7 @@ spec:
   selector:
     name: carts
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: catalogue-db
@@ -158,7 +158,7 @@ spec:
   selector:
     name: catalogue-db
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: catalogue
@@ -204,7 +204,7 @@ spec:
   selector:
     name: catalogue
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: front-end
@@ -280,7 +280,7 @@ spec:
     - catalogue.demo.io
     - carts.demo.io
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: orders-db
@@ -334,7 +334,7 @@ spec:
   selector:
     name: orders-db
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: orders
@@ -392,7 +392,7 @@ spec:
   selector:
     name: orders
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: payment
@@ -438,7 +438,7 @@ spec:
   selector:
     name: payment
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: queue-master
@@ -477,7 +477,7 @@ spec:
   selector:
     name: queue-master
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: rabbitmq
@@ -524,7 +524,7 @@ spec:
   selector:
     name: rabbitmq
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: shipping
@@ -582,7 +582,7 @@ spec:
   selector:
     name: shipping
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: user-db
@@ -636,7 +636,7 @@ spec:
   selector:
     name: user-db
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: user

diff --git a/converter/test/k8scvt/testdata/composite.tgz b/converter/test/k8scvt/testdata/composite.tgz
diff --git a/converter/test/k8scvt/testdata/do.yaml b/converter/test/k8scvt/testdata/do.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: one

diff --git a/converter/test/k8scvt/testdata/env-configmap.yaml b/converter/test/k8scvt/testdata/env-configmap.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: d

diff --git a/converter/test/k8scvt/testdata/env-secretref.yaml b/converter/test/k8scvt/testdata/env-secretref.yaml
@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: d

diff --git a/converter/test/k8scvt/testdata/flat-simple-service-update-strategy.json b/converter/test/k8scvt/testdata/flat-simple-service-update-strategy.json
@@ -83,7 +83,7 @@
    "key":"POD_FIELD_EXAMPLE",
    "valueFrom":
    {"fieldRef":
-    {"apiVersion":"extensions/v1beta1",
+    {"apiVersion":"apps/v1",
      "fieldPath":"spec.restartPolicy"}}},
   {"type":"environment-var",
    "container":"2ae92af3-adc0-45ce-985d-249d589e47e7",

diff --git a/converter/test/k8scvt/testdata/flat-simple-service-update-strategy.yaml b/converter/test/k8scvt/testdata/flat-simple-service-update-strategy.yaml
@@ -1,4 +1,4 @@
-apiVersion: "extensions/v1beta1"
+apiVersion: "apps/v1"
 kind: Deployment
 metadata:
   name: mysql
@@ -57,7 +57,7 @@ spec:
     app: demo
 
 ---
-apiVersion: "extensions/v1beta1"
+apiVersion: "apps/v1"
 kind: Deployment
 metadata:
   name: web

diff --git a/converter/test/k8scvt/testdata/helm-flat-simple-service-settings.json b/converter/test/k8scvt/testdata/helm-flat-simple-service-settings.json
@@ -85,7 +85,7 @@
    "key":"POD_FIELD_EXAMPLE",
    "valueFrom":
    {"fieldRef":
-    {"apiVersion":"extensions\/v1beta1",
+    {"apiVersion":"apps\/v1",
      "fieldPath":"spec.restartPolicy"}},
    "id":"47fe219f-3845-474c-a838-f7c715373781"},
   {"type":"environment-var",

diff --git a/converter/test/k8scvt/testdata/helm-flat-simple-service-settings.yaml b/converter/test/k8scvt/testdata/helm-flat-simple-service-settings.yaml
@@ -26,7 +26,7 @@ deploymentWeb0Spec1Template2Spec3Containers4_name_python_5Env6_name_CONTAINER_FI
 deploymentWeb0Spec1Template2Spec3Containers4_name_python_5Env6_name_CONTAINER_FIELD_EXAMPLE_7ValueFrom8ResourceFieldRef9ContainerName10: "redis"
 deploymentWeb0Spec1Template2Spec3Containers4_name_python_5Env6_name_CONTAINER_FIELD_EXAMPLE_7ValueFrom8ResourceFieldRef9Resource10: "requests.memory"
 deploymentWeb0Spec1Template2Spec3Containers4_name_python_5Env6_name_POD_FIELD_EXAMPLE_7Name8: "POD_FIELD_EXAMPLE"
-deploymentWeb0Spec1Template2Spec3Containers4_name_python_5Env6_name_POD_FIELD_EXAMPLE_7ValueFrom8FieldRef9ApiVersion10: "extensions/v1beta1"
+deploymentWeb0Spec1Template2Spec3Containers4_name_python_5Env6_name_POD_FIELD_EXAMPLE_7ValueFrom8FieldRef9ApiVersion10: "apps/v1"
 deploymentWeb0Spec1Template2Spec3Containers4_name_python_5Env6_name_POD_FIELD_EXAMPLE_7ValueFrom8FieldRef9FieldPath10: "spec.restartPolicy"
 deploymentWeb0Spec1Template2Spec3Containers4_name_python_5Env6_name_REDIS_HOST_7Name8: "REDIS_HOST"
 deploymentWeb0Spec1Template2Spec3Containers4_name_python_5Env6_name_REDIS_HOST_7Value8: "localhost"
@@ -78,7 +78,7 @@ spec:
 ---
 multi-container/templates/DeploymentMysql.yaml:
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mysql
@@ -122,7 +122,7 @@ spec:
 ---
 multi-container/templates/DeploymentWeb.yaml:
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: web

diff --git a/converter/test/k8scvt/testdata/helm-flat-simple-service-settings.yipee b/converter/test/k8scvt/testdata/helm-flat-simple-service-settings.yipee
@@ -63,7 +63,7 @@
    "key":"POD_FIELD_EXAMPLE",
    "valueFrom":
    {"fieldRef":
-    {"apiVersion":"extensions/v1beta1",
+    {"apiVersion":"apps/v1",
      "fieldPath":"spec.restartPolicy"}}},
   {"name":"http",
    "external":"",

diff --git a/converter/test/k8scvt/testdata/helm-flat-simple-service.json b/converter/test/k8scvt/testdata/helm-flat-simple-service.json
@@ -84,7 +84,7 @@
    "key":"POD_FIELD_EXAMPLE",
    "valueFrom":
    {"fieldRef":
-    {"apiVersion":"extensions\/v1beta1",
+    {"apiVersion":"apps\/v1",
      "fieldPath":"spec.restartPolicy"}},
    "id":"c5508733-a878-42fb-916d-1df33d6d6310"},
   {"type":"environment-var",