Refresh converter clojure code; update to go 1.17

.gitignore

@@ -0,0 +1,2 @@
+goapi/bin/*
+goapi/coverage.*

api/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:8.14.0-alpine
+FROM node:17.6-alpine
 WORKDIR /usr/src/app
 # Uncomment kubectl installation if you want api support
 # for "experimental" features

build.sh

@@ -8,10 +8,11 @@ then
 fi
 
 CVT_IMG=$ORG/converter:$TAG
-API_IMG=$ORG/api:$TAG
+export API_IMG=$ORG/api:$TAG
 UI_IMG=$ORG/ui:$TAG
 
+echo $API_IMG
 
 (cd converter; docker build -t $CVT_IMG .) || exit 1
-(cd goapi; bash goapi_build.sh $API_IMG ) || exit 1
+(cd goapi; make image) || exit 1
 (cd ui; docker build -t $UI_IMG .) || exit 1

converter/Dockerfile

@@ -1,10 +1,10 @@
-FROM clojure:lein-2.8.1-alpine AS build
-ARG HELM_VERSION=2.9.1
+FROM clojure:openjdk-17-alpine AS build
+ARG HELM_VERSION=2.17.0
 ENV DEBUG_COMPILE ${DEBUG_COMPILE}
 ENV NO_PERF_COMPILE ${NO_PERF_COMPILE}
 ENV SHOW_RULES ${SHOW_RULES}
 ENV HELM_TAR_FILE helm-v${HELM_VERSION}-linux-amd64.tar.gz
-ADD https://storage.googleapis.com/kubernetes-helm/${HELM_TAR_FILE} .
+ADD https://get.helm.sh/${HELM_TAR_FILE} .
 RUN apk add --update --no-cache ca-certificates \
                                 coreutils && \
     tar xvf ${HELM_TAR_FILE} && \
@@ -18,7 +18,7 @@ RUN lein clean && \
     lein cloverage && \
     lein uberjar
 
-FROM openjdk:jre-alpine
+FROM openjdk:17-alpine3.14
 COPY --from=build /app/target/uberjar/converter-0.1.0-SNAPSHOT-standalone.jar /
 COPY --from=build /usr/bin/helm /usr/bin
 RUN chmod +x /usr/bin/helm

converter/project.clj

@@ -3,25 +3,24 @@
   :url "https://yipee.io"
   :license {:name "Eclipse Public License"
             :url "http://www.eclipse.org/legal/epl-v10.html"}
-  :dependencies [[org.clojure/clojure "1.8.0"]
-                 [org.clojure/tools.logging "0.4.0"]
+  :dependencies [[org.clojure/clojure "1.10.3"]
+                 [org.clojure/tools.logging "1.2.4"]
                  [ch.qos.logback/logback-classic "1.2.3"]
-                 [clj-yaml "0.4.0"]
-                 [commons-io "2.6"]
-                 [org.apache.commons/commons-compress "1.14"]
-                 [org.javasimon/javasimon-core "4.1.3"]
-                 [org.clojure/data.json "0.2.6"]
-                 [org.flatland/ordered "1.5.6"]
-                 [liberator "0.15.1"]
-                 [compojure "1.6.0"]
-                 [ring/ring-jetty-adapter "1.6.2"]
-                 [ring/ring-core "1.6.2"]
-                 [com.github.seancfoley/ipaddress "3.0.0"]
-                 [prismatic/schema "1.1.7"]
+                 [clj-commons/clj-yaml "0.7.108"]
+                 [org.apache.commons/commons-compress "1.21"]
+                 [org.javasimon/javasimon-core "4.2.0"]
+                 [org.clojure/data.json "2.4.0"]
+                 [org.flatland/ordered "1.5.9"]
+                 [liberator "0.15.3"]
+                 [compojure "1.6.2"]
+                 [ring/ring-jetty-adapter "1.9.5"]
+                 [ring/ring-core "1.9.5"]
+                 [com.github.seancfoley/ipaddress "5.3.3"]
+                 [prismatic/schema "1.1.12"]
                  [potemkin "0.4.5"]
-                 [com.networknt/json-schema-validator "0.1.7"]
-                 [environ "1.1.0"]
-                 [inflections "0.13.0"]
+                 [com.networknt/json-schema-validator "1.0.66"]
+                 [environ "1.2.0"]
+                 [inflections "0.13.2"]
                  [arete "0.6.1"]]
 
   :main ^:skip-aot converter.core

converter/schemata/config_schema_v2.yipee.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema#",
   "id": "config_schema_v2.yipee.json",
   "type": "object",
   "required": ["version"],

converter/schemata/config_schema_v3.0.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema#",
   "id": "config_schema_v3.0.json",
   "type": "object",
   "required": ["version"],

converter/schemata/config_schema_v3.1.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema#",
   "id": "config_schema_v3.1.json",
   "type": "object",
   "required": ["version"],

converter/schemata/config_schema_v3.2.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema#",
   "id": "config_schema_v3.2.json",
   "type": "object",
   "required": ["version"],

converter/schemata/config_schema_v3.3.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema#",
   "id": "config_schema_v3.3.json",
   "type": "object",
   "required": ["version"],

converter/schemata/config_schema_v3.4.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema#",
   "id": "config_schema_v3.4.json",
   "type": "object",
   "required": ["version"],

converter/schemata/config_schema_v3.5.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/draft-04/schema#",
+  "$schema": "https://json-schema.org/draft/2019-09/schema#",
   "id": "config_schema_v3.5.json",
   "type": "object",
   "required": ["version"],

converter/schemata/master-standalone-strict/_definitions.json

@@ -5497,7 +5497,7 @@
       }
     }, 
     "io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1beta1.JSONSchemaProps": {
-      "description": "JSONSchemaProps is a JSON-Schema following Specification Draft 4 (http://json-schema.org/).", 
+      "description": "JSONSchemaProps is a JSON-Schema following Specification Draft 4 (https://json-schema.org/).", 
       "properties": {
         "maxItems": {
           "type": "integer", 

converter/schemata/master-standalone-strict/aggregationrule.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "description": "AggregationRule describes how to locate ClusterRoles to aggregate into the ClusterRole", 
   "properties": {

converter/schemata/master-standalone-strict/allowedflexvolume.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "driver"
   ], 

converter/schemata/master-standalone-strict/allowedhostpath.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "description": "AllowedHostPath defines the host volume conditions that will be enabled by a policy for pods to use. It requires the path prefix to be defined. Deprecated: use AllowedHostPath from policy API Group instead.", 
   "properties": {

converter/schemata/master-standalone-strict/apigroup.json

@@ -11,7 +11,7 @@
       "group": ""
     }
   ], 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "properties": {
     "kind": {

converter/schemata/master-standalone-strict/apigrouplist.json

@@ -10,7 +10,7 @@
       "group": ""
     }
   ], 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "properties": {
     "kind": {

converter/schemata/master-standalone-strict/apiresource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "name", 
     "singularName", 

converter/schemata/master-standalone-strict/apiresourcelist.json

@@ -11,7 +11,7 @@
       "group": ""
     }
   ], 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "properties": {
     "kind": {

converter/schemata/master-standalone-strict/apiservice.json

@@ -1,6 +1,6 @@
 {
   "type": "object", 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "x-kubernetes-group-version-kind": [
     {
       "kind": "APIService", 

converter/schemata/master-standalone-strict/apiservicecondition.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "type", 
     "status"

converter/schemata/master-standalone-strict/apiservicelist.json

@@ -10,7 +10,7 @@
       "group": "apiregistration.k8s.io"
     }
   ], 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "properties": {
     "items": {

converter/schemata/master-standalone-strict/apiservicespec.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "service", 
     "groupPriorityMinimum", 

converter/schemata/master-standalone-strict/apiservicestatus.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "description": "APIServiceStatus contains derived information about an API server", 
   "properties": {

converter/schemata/master-standalone-strict/apiversions.json

@@ -11,7 +11,7 @@
       "group": ""
     }
   ], 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "properties": {
     "serverAddressByClientCIDRs": {

converter/schemata/master-standalone-strict/attachedvolume.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "name", 
     "devicePath"

converter/schemata/master-standalone-strict/awselasticblockstorevolumesource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "volumeID"
   ], 

converter/schemata/master-standalone-strict/azurefilepersistentvolumesource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "secretName", 
     "shareName"

converter/schemata/master-standalone-strict/binding.json

@@ -10,7 +10,7 @@
       "group": ""
     }
   ], 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "properties": {
     "kind": {

converter/schemata/master-standalone-strict/cephfspersistentvolumesource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "monitors"
   ], 

converter/schemata/master-standalone-strict/cephfsvolumesource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "monitors"
   ], 

converter/schemata/master-standalone-strict/certificatesigningrequest.json

@@ -1,6 +1,6 @@
 {
   "type": "object", 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "x-kubernetes-group-version-kind": [
     {
       "kind": "CertificateSigningRequest", 

converter/schemata/master-standalone-strict/certificatesigningrequestcondition.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "type"
   ], 

converter/schemata/master-standalone-strict/certificatesigningrequestlist.json

@@ -1,6 +1,6 @@
 {
   "type": "object", 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "items"
   ], 

converter/schemata/master-standalone-strict/cinderpersistentvolumesource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "volumeID"
   ], 

converter/schemata/master-standalone-strict/clientipconfig.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "description": "ClientIPConfig represents the configurations of Client IP based session affinity.", 
   "properties": {

converter/schemata/master-standalone-strict/clusterrolelist.json

@@ -10,7 +10,7 @@
       "group": "rbac.authorization.k8s.io"
     }
   ], 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "properties": {
     "items": {

converter/schemata/master-standalone-strict/componentstatus.json

@@ -1,6 +1,6 @@
 {
   "type": "object", 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "x-kubernetes-group-version-kind": [
     {
       "kind": "ComponentStatus", 

converter/schemata/master-standalone-strict/componentstatuslist.json

@@ -10,7 +10,7 @@
       "group": ""
     }
   ], 
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "properties": {
     "items": {

converter/schemata/master-standalone-strict/configmapenvsource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "description": "ConfigMapEnvSource selects a ConfigMap to populate the environment variables with.\n\nThe contents of the target ConfigMap's Data field will represent the key-value pairs as environment variables.", 
   "properties": {

converter/schemata/master-standalone-strict/configmapnodeconfigsource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "required": [
     "namespace", 
     "name", 

converter/schemata/master-standalone-strict/configmapprojection.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "description": "Adapts a ConfigMap into a projected volume.\n\nThe contents of the target ConfigMap's Data field will be presented in a projected volume as files using the keys in the Data field as the file names, unless the items element is populated with specific mappings of keys to paths. Note that this is identical to a configmap volume source without the default mode.", 
   "properties": {

converter/schemata/master-standalone-strict/configmapvolumesource.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "description": "Adapts a ConfigMap into a volume.\n\nThe contents of the target ConfigMap's Data field will be presented in a volume as files using the keys in the Data field as the file names, unless the items element is populated with specific mappings of keys to paths. ConfigMap volumes support ownership management and SELinux relabeling.", 
   "properties": {

converter/schemata/master-standalone-strict/containerstate.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "description": "ContainerState holds a possible state of container. Only one of its members may be specified. If none of them is specified, the default one is ContainerStateWaiting.", 
   "properties": {

converter/schemata/master-standalone-strict/containerstaterunning.json

@@ -1,5 +1,5 @@
 {
-  "$schema": "http://json-schema.org/schema#", 
+  "$schema": "https://json-schema.org/draft/2019-09/schema#", 
   "type": "object", 
   "description": "ContainerStateRunning is a running state of a container.", 
   "properties": {