From 4adcda3efbed97262930533c4f3c99f2e54d41b4 Mon Sep 17 00:00:00 2001 From: Mark Emeis Date: Thu, 3 Mar 2022 16:30:17 -0700 Subject: [PATCH 1/3] Refresh all converter dependencies --- converter/Dockerfile | 8 +++--- converter/project.clj | 33 ++++++++++++------------- converter/src/composecvt/validators.clj | 2 +- converter/src/k8scvt/validators.clj | 2 +- 4 files changed, 22 insertions(+), 23 deletions(-) diff --git a/converter/Dockerfile b/converter/Dockerfile index 64f4355..46023ef 100644 --- a/converter/Dockerfile +++ b/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 diff --git a/converter/project.clj b/converter/project.clj index 5ea8195..38c9d96 100644 --- a/converter/project.clj +++ b/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 diff --git a/converter/src/composecvt/validators.clj b/converter/src/composecvt/validators.clj index ad34a1f..98c6f40 100644 --- a/converter/src/composecvt/validators.clj +++ b/converter/src/composecvt/validators.clj @@ -24,7 +24,7 @@ (defn get-schema [vsn] (let [schemastr (get-schema-string vsn) - schema (.getSchema (new JsonSchemaFactory) schemastr)] + schema (.getSchema (JsonSchemaFactory/getInstance) schemastr)] schema)) (defn validate-app [app] diff --git a/converter/src/k8scvt/validators.clj b/converter/src/k8scvt/validators.clj index 86d33ac..f5e7d4f 100644 --- a/converter/src/k8scvt/validators.clj +++ b/converter/src/k8scvt/validators.clj @@ -14,7 +14,7 @@ (try (let [fname (str schemaurl (str/lower-case kind) ".json") schemastr (slurp fname) - schema (.getSchema (new JsonSchemaFactory) schemastr)] + schema (.getSchema (JsonSchemaFactory/getInstance) schemastr)] schema) (catch Exception e (when-not (instance? java.io.FileNotFoundException e) From 0363262db97ec6609a639af8cb545381a9278417 Mon Sep 17 00:00:00 2001 From: Mark Emeis Date: Fri, 4 Mar 2022 17:00:57 -0700 Subject: [PATCH 2/3] Update to a newer version of json schema. --- converter/schemata/config_schema_v2.yipee.json | 2 +- converter/schemata/config_schema_v3.0.json | 2 +- converter/schemata/config_schema_v3.1.json | 2 +- converter/schemata/config_schema_v3.2.json | 2 +- converter/schemata/config_schema_v3.3.json | 2 +- converter/schemata/config_schema_v3.4.json | 2 +- converter/schemata/config_schema_v3.5.json | 2 +- converter/schemata/master-standalone-strict/_definitions.json | 2 +- .../schemata/master-standalone-strict/aggregationrule.json | 2 +- .../schemata/master-standalone-strict/allowedflexvolume.json | 2 +- .../schemata/master-standalone-strict/allowedhostpath.json | 2 +- converter/schemata/master-standalone-strict/apigroup.json | 2 +- converter/schemata/master-standalone-strict/apigrouplist.json | 2 +- converter/schemata/master-standalone-strict/apiresource.json | 2 +- .../schemata/master-standalone-strict/apiresourcelist.json | 2 +- converter/schemata/master-standalone-strict/apiservice.json | 2 +- .../master-standalone-strict/apiservicecondition.json | 2 +- .../schemata/master-standalone-strict/apiservicelist.json | 2 +- .../schemata/master-standalone-strict/apiservicespec.json | 2 +- .../schemata/master-standalone-strict/apiservicestatus.json | 2 +- converter/schemata/master-standalone-strict/apiversions.json | 2 +- .../schemata/master-standalone-strict/attachedvolume.json | 2 +- .../awselasticblockstorevolumesource.json | 2 +- .../azurefilepersistentvolumesource.json | 2 +- converter/schemata/master-standalone-strict/binding.json | 2 +- .../cephfspersistentvolumesource.json | 2 +- .../schemata/master-standalone-strict/cephfsvolumesource.json | 2 +- .../master-standalone-strict/certificatesigningrequest.json | 2 +- .../certificatesigningrequestcondition.json | 2 +- .../certificatesigningrequestlist.json | 2 +- .../cinderpersistentvolumesource.json | 2 +- .../schemata/master-standalone-strict/clientipconfig.json | 2 +- .../schemata/master-standalone-strict/clusterrolelist.json | 2 +- .../schemata/master-standalone-strict/componentstatus.json | 2 +- .../master-standalone-strict/componentstatuslist.json | 2 +- .../schemata/master-standalone-strict/configmapenvsource.json | 2 +- .../master-standalone-strict/configmapnodeconfigsource.json | 2 +- .../master-standalone-strict/configmapprojection.json | 2 +- .../master-standalone-strict/configmapvolumesource.json | 2 +- .../schemata/master-standalone-strict/containerstate.json | 2 +- .../master-standalone-strict/containerstaterunning.json | 2 +- .../master-standalone-strict/containerstatewaiting.json | 2 +- .../schemata/master-standalone-strict/containerstatus.json | 2 +- .../schemata/master-standalone-strict/controllerrevision.json | 2 +- .../master-standalone-strict/controllerrevisionlist.json | 2 +- converter/schemata/master-standalone-strict/cronjob.json | 2 +- converter/schemata/master-standalone-strict/cronjoblist.json | 2 +- converter/schemata/master-standalone-strict/cronjobspec.json | 2 +- .../schemata/master-standalone-strict/cronjobstatus.json | 2 +- .../master-standalone-strict/crossversionobjectreference.json | 2 +- .../master-standalone-strict/csipersistentvolumesource.json | 2 +- .../customresourcecolumndefinition.json | 2 +- .../customresourcedefinitioncondition.json | 2 +- .../customresourcedefinitionnames.json | 2 +- .../customresourcedefinitionstatus.json | 2 +- .../customresourcedefinitionversion.json | 2 +- .../master-standalone-strict/customresourcesubresources.json | 2 +- .../customresourcesubresourcescale.json | 2 +- .../customresourcesubresourcestatus.json | 2 +- .../schemata/master-standalone-strict/daemonendpoint.json | 2 +- .../schemata/master-standalone-strict/daemonsetcondition.json | 2 +- .../schemata/master-standalone-strict/daemonsetlist.json | 2 +- .../schemata/master-standalone-strict/daemonsetspec.json | 2 +- .../schemata/master-standalone-strict/daemonsetstatus.json | 2 +- .../master-standalone-strict/daemonsetupdatestrategy.json | 2 +- .../schemata/master-standalone-strict/deleteoptions.json | 2 +- .../schemata/master-standalone-strict/deploymentrollback.json | 2 +- .../schemata/master-standalone-strict/deploymentspec.json | 2 +- .../schemata/master-standalone-strict/deploymentstatus.json | 2 +- .../schemata/master-standalone-strict/endpointslist.json | 2 +- .../schemata/master-standalone-strict/endpointsubset.json | 2 +- .../schemata/master-standalone-strict/envfromsource.json | 2 +- converter/schemata/master-standalone-strict/eventseries.json | 2 +- converter/schemata/master-standalone-strict/eventsource.json | 2 +- converter/schemata/master-standalone-strict/execaction.json | 2 +- .../master-standalone-strict/externaldocumentation.json | 2 +- .../master-standalone-strict/externalmetricsource.json | 2 +- .../master-standalone-strict/externalmetricstatus.json | 2 +- .../master-standalone-strict/flexpersistentvolumesource.json | 2 +- .../master-standalone-strict/flockervolumesource.json | 2 +- .../master-standalone-strict/fsgroupstrategyoptions.json | 2 +- .../master-standalone-strict/gitrepovolumesource.json | 2 +- .../master-standalone-strict/groupversionfordiscovery.json | 2 +- .../master-standalone-strict/horizontalpodautoscaler.json | 2 +- .../horizontalpodautoscalercondition.json | 2 +- .../master-standalone-strict/horizontalpodautoscalerspec.json | 2 +- converter/schemata/master-standalone-strict/hostalias.json | 2 +- .../master-standalone-strict/hostpathvolumesource.json | 2 +- .../schemata/master-standalone-strict/hostportrange.json | 2 +- converter/schemata/master-standalone-strict/info.json | 2 +- converter/schemata/master-standalone-strict/ingress.json | 2 +- .../schemata/master-standalone-strict/ingressbackend.json | 2 +- converter/schemata/master-standalone-strict/initializer.json | 2 +- .../master-standalone-strict/initializerconfiguration.json | 2 +- .../initializerconfigurationlist.json | 2 +- converter/schemata/master-standalone-strict/initializers.json | 2 +- converter/schemata/master-standalone-strict/intorstring.json | 2 +- converter/schemata/master-standalone-strict/ipblock.json | 2 +- .../master-standalone-strict/iscsipersistentvolumesource.json | 2 +- .../schemata/master-standalone-strict/jobtemplatespec.json | 2 +- converter/schemata/master-standalone-strict/json.json | 2 +- .../schemata/master-standalone-strict/labelselector.json | 2 +- .../master-standalone-strict/labelselectorrequirement.json | 2 +- converter/schemata/master-standalone-strict/lifecycle.json | 2 +- converter/schemata/master-standalone-strict/limitrange.json | 2 +- .../schemata/master-standalone-strict/limitrangelist.json | 2 +- converter/schemata/master-standalone-strict/listmeta.json | 2 +- .../master-standalone-strict/localobjectreference.json | 2 +- .../schemata/master-standalone-strict/localvolumesource.json | 2 +- converter/schemata/master-standalone-strict/metricspec.json | 2 +- converter/schemata/master-standalone-strict/metricstatus.json | 2 +- converter/schemata/master-standalone-strict/microtime.json | 2 +- .../mutatingwebhookconfiguration.json | 2 +- .../mutatingwebhookconfigurationlist.json | 2 +- .../schemata/master-standalone-strict/namespacespec.json | 2 +- .../master-standalone-strict/networkpolicyegressrule.json | 2 +- .../master-standalone-strict/networkpolicyingressrule.json | 2 +- .../schemata/master-standalone-strict/networkpolicylist.json | 2 +- .../schemata/master-standalone-strict/nfsvolumesource.json | 2 +- converter/schemata/master-standalone-strict/nodeaddress.json | 2 +- .../schemata/master-standalone-strict/nodecondition.json | 2 +- .../schemata/master-standalone-strict/nodeconfigsource.json | 2 +- .../schemata/master-standalone-strict/nodeconfigstatus.json | 2 +- .../master-standalone-strict/nodedaemonendpoints.json | 2 +- converter/schemata/master-standalone-strict/nodeselector.json | 2 +- .../master-standalone-strict/nonresourceattributes.json | 2 +- .../schemata/master-standalone-strict/nonresourcerule.json | 2 +- converter/schemata/master-standalone-strict/objectmeta.json | 2 +- .../schemata/master-standalone-strict/objectmetricsource.json | 2 +- .../schemata/master-standalone-strict/objectmetricstatus.json | 2 +- .../schemata/master-standalone-strict/ownerreference.json | 2 +- converter/schemata/master-standalone-strict/patch.json | 2 +- .../schemata/master-standalone-strict/persistentvolume.json | 2 +- .../master-standalone-strict/persistentvolumeclaim.json | 2 +- .../persistentvolumeclaimcondition.json | 2 +- .../master-standalone-strict/persistentvolumestatus.json | 2 +- converter/schemata/master-standalone-strict/podaffinity.json | 2 +- .../schemata/master-standalone-strict/podaffinityterm.json | 2 +- converter/schemata/master-standalone-strict/podcondition.json | 2 +- .../master-standalone-strict/poddisruptionbudget.json | 2 +- .../master-standalone-strict/poddisruptionbudgetspec.json | 2 +- .../master-standalone-strict/poddisruptionbudgetstatus.json | 2 +- converter/schemata/master-standalone-strict/poddnsconfig.json | 2 +- .../schemata/master-standalone-strict/poddnsconfigoption.json | 2 +- .../schemata/master-standalone-strict/podpresetlist.json | 2 +- .../schemata/master-standalone-strict/podreadinessgate.json | 2 +- .../schemata/master-standalone-strict/podsecuritycontext.json | 2 +- .../schemata/master-standalone-strict/podsecuritypolicy.json | 2 +- .../master-standalone-strict/podsecuritypolicylist.json | 2 +- .../schemata/master-standalone-strict/podsmetricsource.json | 2 +- .../schemata/master-standalone-strict/podsmetricstatus.json | 2 +- converter/schemata/master-standalone-strict/policyrule.json | 2 +- .../schemata/master-standalone-strict/preconditions.json | 2 +- .../schemata/master-standalone-strict/priorityclass.json | 2 +- .../schemata/master-standalone-strict/priorityclasslist.json | 2 +- converter/schemata/master-standalone-strict/probe.json | 2 +- converter/schemata/master-standalone-strict/quantity.json | 2 +- converter/schemata/master-standalone-strict/rawextension.json | 2 +- .../master-standalone-strict/rbdpersistentvolumesource.json | 2 +- .../schemata/master-standalone-strict/rbdvolumesource.json | 2 +- converter/schemata/master-standalone-strict/replicaset.json | 2 +- .../schemata/master-standalone-strict/replicasetlist.json | 2 +- .../schemata/master-standalone-strict/replicasetspec.json | 2 +- .../master-standalone-strict/replicationcontroller.json | 2 +- .../master-standalone-strict/replicationcontrollerspec.json | 2 +- .../master-standalone-strict/replicationcontrollerstatus.json | 2 +- .../master-standalone-strict/resourcemetricsource.json | 2 +- .../master-standalone-strict/resourcemetricstatus.json | 2 +- .../master-standalone-strict/resourcequotastatus.json | 2 +- .../master-standalone-strict/resourcerequirements.json | 2 +- converter/schemata/master-standalone-strict/resourcerule.json | 2 +- converter/schemata/master-standalone-strict/role.json | 2 +- converter/schemata/master-standalone-strict/rolebinding.json | 2 +- converter/schemata/master-standalone-strict/rolelist.json | 2 +- converter/schemata/master-standalone-strict/roleref.json | 2 +- .../master-standalone-strict/rollingupdatedaemonset.json | 2 +- .../master-standalone-strict/rollingupdatedeployment.json | 2 +- .../rollingupdatestatefulsetstrategy.json | 2 +- .../schemata/master-standalone-strict/rulewithoperations.json | 2 +- .../master-standalone-strict/runasuserstrategyoptions.json | 2 +- converter/schemata/master-standalone-strict/scale.json | 2 +- .../scaleiopersistentvolumesource.json | 2 +- .../master-standalone-strict/scaleiovolumesource.json | 2 +- converter/schemata/master-standalone-strict/scalespec.json | 2 +- .../scopedresourceselectorrequirement.json | 2 +- .../schemata/master-standalone-strict/scopeselector.json | 2 +- converter/schemata/master-standalone-strict/secret.json | 2 +- .../schemata/master-standalone-strict/secretreference.json | 2 +- .../schemata/master-standalone-strict/securitycontext.json | 2 +- .../master-standalone-strict/selfsubjectaccessreviewspec.json | 2 +- .../master-standalone-strict/selfsubjectrulesreview.json | 2 +- .../master-standalone-strict/selfsubjectrulesreviewspec.json | 2 +- .../schemata/master-standalone-strict/selinuxoptions.json | 2 +- .../master-standalone-strict/selinuxstrategyoptions.json | 2 +- .../master-standalone-strict/serveraddressbyclientcidr.json | 2 +- converter/schemata/master-standalone-strict/service.json | 2 +- .../schemata/master-standalone-strict/serviceaccountlist.json | 2 +- .../serviceaccounttokenprojection.json | 2 +- converter/schemata/master-standalone-strict/serviceport.json | 2 +- .../schemata/master-standalone-strict/servicereference.json | 2 +- converter/schemata/master-standalone-strict/servicespec.json | 2 +- .../schemata/master-standalone-strict/servicestatus.json | 2 +- .../master-standalone-strict/sessionaffinityconfig.json | 2 +- converter/schemata/master-standalone-strict/statefulset.json | 2 +- .../master-standalone-strict/statefulsetcondition.json | 2 +- .../schemata/master-standalone-strict/statefulsetlist.json | 2 +- .../schemata/master-standalone-strict/statefulsetstatus.json | 2 +- .../master-standalone-strict/statefulsetupdatestrategy.json | 2 +- converter/schemata/master-standalone-strict/status.json | 2 +- converter/schemata/master-standalone-strict/statuscause.json | 2 +- .../schemata/master-standalone-strict/statusdetails.json | 2 +- converter/schemata/master-standalone-strict/storageclass.json | 2 +- converter/schemata/master-standalone-strict/subject.json | 2 +- .../master-standalone-strict/subjectaccessreview.json | 2 +- .../master-standalone-strict/subjectaccessreviewstatus.json | 2 +- .../master-standalone-strict/subjectrulesreviewstatus.json | 2 +- .../supplementalgroupsstrategyoptions.json | 2 +- converter/schemata/master-standalone-strict/sysctl.json | 2 +- converter/schemata/master-standalone-strict/taint.json | 2 +- converter/schemata/master-standalone-strict/time.json | 2 +- converter/schemata/master-standalone-strict/toleration.json | 2 +- .../topologyselectorlabelrequirement.json | 2 +- .../master-standalone-strict/topologyselectorterm.json | 2 +- converter/schemata/master-standalone-strict/userinfo.json | 2 +- .../validatingwebhookconfiguration.json | 2 +- .../validatingwebhookconfigurationlist.json | 2 +- .../schemata/master-standalone-strict/volumeattachment.json | 2 +- .../master-standalone-strict/volumeattachmentlist.json | 2 +- .../master-standalone-strict/volumeattachmentsource.json | 2 +- .../master-standalone-strict/volumeattachmentspec.json | 2 +- .../master-standalone-strict/volumeattachmentstatus.json | 2 +- converter/schemata/master-standalone-strict/volumedevice.json | 2 +- converter/schemata/master-standalone-strict/volumeerror.json | 2 +- .../schemata/master-standalone-strict/volumenodeaffinity.json | 2 +- .../vspherevirtualdiskvolumesource.json | 2 +- converter/schemata/master-standalone-strict/watchevent.json | 2 +- converter/schemata/master-standalone-strict/webhook.json | 2 +- .../master-standalone-strict/webhookclientconfig.json | 2 +- .../master-standalone-strict/weightedpodaffinityterm.json | 2 +- converter/src/composecvt/validators.clj | 4 ++-- converter/src/k8scvt/validators.clj | 4 ++-- converter/test/k8scvt/testdata/bad-layout-anno.json | 2 +- 242 files changed, 244 insertions(+), 244 deletions(-) diff --git a/converter/schemata/config_schema_v2.yipee.json b/converter/schemata/config_schema_v2.yipee.json index 3f07302..48182a7 100644 --- a/converter/schemata/config_schema_v2.yipee.json +++ b/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"], diff --git a/converter/schemata/config_schema_v3.0.json b/converter/schemata/config_schema_v3.0.json index f39344c..52ba87b 100644 --- a/converter/schemata/config_schema_v3.0.json +++ b/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"], diff --git a/converter/schemata/config_schema_v3.1.json b/converter/schemata/config_schema_v3.1.json index 719c0fa..6ebb1af 100644 --- a/converter/schemata/config_schema_v3.1.json +++ b/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"], diff --git a/converter/schemata/config_schema_v3.2.json b/converter/schemata/config_schema_v3.2.json index 6e0e0e7..2f23a86 100644 --- a/converter/schemata/config_schema_v3.2.json +++ b/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"], diff --git a/converter/schemata/config_schema_v3.3.json b/converter/schemata/config_schema_v3.3.json index 0b735cf..1e1a333 100644 --- a/converter/schemata/config_schema_v3.3.json +++ b/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"], diff --git a/converter/schemata/config_schema_v3.4.json b/converter/schemata/config_schema_v3.4.json index 93fe821..3273a8d 100644 --- a/converter/schemata/config_schema_v3.4.json +++ b/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"], diff --git a/converter/schemata/config_schema_v3.5.json b/converter/schemata/config_schema_v3.5.json index 4244e10..79a3c01 100644 --- a/converter/schemata/config_schema_v3.5.json +++ b/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"], diff --git a/converter/schemata/master-standalone-strict/_definitions.json b/converter/schemata/master-standalone-strict/_definitions.json index 7630713..588ac85 100644 --- a/converter/schemata/master-standalone-strict/_definitions.json +++ b/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", diff --git a/converter/schemata/master-standalone-strict/aggregationrule.json b/converter/schemata/master-standalone-strict/aggregationrule.json index 644d763..5ffa3c6 100644 --- a/converter/schemata/master-standalone-strict/aggregationrule.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/allowedflexvolume.json b/converter/schemata/master-standalone-strict/allowedflexvolume.json index 2df62d0..e5f52ca 100644 --- a/converter/schemata/master-standalone-strict/allowedflexvolume.json +++ b/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" ], diff --git a/converter/schemata/master-standalone-strict/allowedhostpath.json b/converter/schemata/master-standalone-strict/allowedhostpath.json index bcf7b1b..8a3695e 100644 --- a/converter/schemata/master-standalone-strict/allowedhostpath.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/apigroup.json b/converter/schemata/master-standalone-strict/apigroup.json index b7e3caa..443c320 100644 --- a/converter/schemata/master-standalone-strict/apigroup.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/apigrouplist.json b/converter/schemata/master-standalone-strict/apigrouplist.json index b87e8de..22657e6 100644 --- a/converter/schemata/master-standalone-strict/apigrouplist.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/apiresource.json b/converter/schemata/master-standalone-strict/apiresource.json index 4bae642..83e779d 100644 --- a/converter/schemata/master-standalone-strict/apiresource.json +++ b/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", diff --git a/converter/schemata/master-standalone-strict/apiresourcelist.json b/converter/schemata/master-standalone-strict/apiresourcelist.json index 6031b75..164fd55 100644 --- a/converter/schemata/master-standalone-strict/apiresourcelist.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/apiservice.json b/converter/schemata/master-standalone-strict/apiservice.json index 6f8946f..eddc33d 100644 --- a/converter/schemata/master-standalone-strict/apiservice.json +++ b/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", diff --git a/converter/schemata/master-standalone-strict/apiservicecondition.json b/converter/schemata/master-standalone-strict/apiservicecondition.json index d492823..86d17dc 100644 --- a/converter/schemata/master-standalone-strict/apiservicecondition.json +++ b/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" diff --git a/converter/schemata/master-standalone-strict/apiservicelist.json b/converter/schemata/master-standalone-strict/apiservicelist.json index 116b9f4..7ae8b70 100644 --- a/converter/schemata/master-standalone-strict/apiservicelist.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/apiservicespec.json b/converter/schemata/master-standalone-strict/apiservicespec.json index 54cf594..3c4cba8 100644 --- a/converter/schemata/master-standalone-strict/apiservicespec.json +++ b/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", diff --git a/converter/schemata/master-standalone-strict/apiservicestatus.json b/converter/schemata/master-standalone-strict/apiservicestatus.json index 0c9d23f..540770a 100644 --- a/converter/schemata/master-standalone-strict/apiservicestatus.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/apiversions.json b/converter/schemata/master-standalone-strict/apiversions.json index 934a6d0..6fcfe65 100644 --- a/converter/schemata/master-standalone-strict/apiversions.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/attachedvolume.json b/converter/schemata/master-standalone-strict/attachedvolume.json index e852392..6b9559c 100644 --- a/converter/schemata/master-standalone-strict/attachedvolume.json +++ b/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" diff --git a/converter/schemata/master-standalone-strict/awselasticblockstorevolumesource.json b/converter/schemata/master-standalone-strict/awselasticblockstorevolumesource.json index 80606e2..163a13b 100644 --- a/converter/schemata/master-standalone-strict/awselasticblockstorevolumesource.json +++ b/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" ], diff --git a/converter/schemata/master-standalone-strict/azurefilepersistentvolumesource.json b/converter/schemata/master-standalone-strict/azurefilepersistentvolumesource.json index ef48c71..8f1a037 100644 --- a/converter/schemata/master-standalone-strict/azurefilepersistentvolumesource.json +++ b/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" diff --git a/converter/schemata/master-standalone-strict/binding.json b/converter/schemata/master-standalone-strict/binding.json index f5a4bd1..bd73ba0 100644 --- a/converter/schemata/master-standalone-strict/binding.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/cephfspersistentvolumesource.json b/converter/schemata/master-standalone-strict/cephfspersistentvolumesource.json index afc0a8e..f61d88e 100644 --- a/converter/schemata/master-standalone-strict/cephfspersistentvolumesource.json +++ b/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" ], diff --git a/converter/schemata/master-standalone-strict/cephfsvolumesource.json b/converter/schemata/master-standalone-strict/cephfsvolumesource.json index 020f033..f51ca15 100644 --- a/converter/schemata/master-standalone-strict/cephfsvolumesource.json +++ b/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" ], diff --git a/converter/schemata/master-standalone-strict/certificatesigningrequest.json b/converter/schemata/master-standalone-strict/certificatesigningrequest.json index 6c9a932..2c925ba 100644 --- a/converter/schemata/master-standalone-strict/certificatesigningrequest.json +++ b/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", diff --git a/converter/schemata/master-standalone-strict/certificatesigningrequestcondition.json b/converter/schemata/master-standalone-strict/certificatesigningrequestcondition.json index 6cc8b20..f10a63c 100644 --- a/converter/schemata/master-standalone-strict/certificatesigningrequestcondition.json +++ b/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" ], diff --git a/converter/schemata/master-standalone-strict/certificatesigningrequestlist.json b/converter/schemata/master-standalone-strict/certificatesigningrequestlist.json index 17bc6d9..af8649a 100644 --- a/converter/schemata/master-standalone-strict/certificatesigningrequestlist.json +++ b/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" ], diff --git a/converter/schemata/master-standalone-strict/cinderpersistentvolumesource.json b/converter/schemata/master-standalone-strict/cinderpersistentvolumesource.json index 29ca7f6..8b72358 100644 --- a/converter/schemata/master-standalone-strict/cinderpersistentvolumesource.json +++ b/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" ], diff --git a/converter/schemata/master-standalone-strict/clientipconfig.json b/converter/schemata/master-standalone-strict/clientipconfig.json index 5cbe985..3bfe860 100644 --- a/converter/schemata/master-standalone-strict/clientipconfig.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/clusterrolelist.json b/converter/schemata/master-standalone-strict/clusterrolelist.json index ac58ef6..9d262b9 100644 --- a/converter/schemata/master-standalone-strict/clusterrolelist.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/componentstatus.json b/converter/schemata/master-standalone-strict/componentstatus.json index 55081be..5117e11 100644 --- a/converter/schemata/master-standalone-strict/componentstatus.json +++ b/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", diff --git a/converter/schemata/master-standalone-strict/componentstatuslist.json b/converter/schemata/master-standalone-strict/componentstatuslist.json index 2ec51f8..386408f 100644 --- a/converter/schemata/master-standalone-strict/componentstatuslist.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/configmapenvsource.json b/converter/schemata/master-standalone-strict/configmapenvsource.json index bcdd220..180e268 100644 --- a/converter/schemata/master-standalone-strict/configmapenvsource.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/configmapnodeconfigsource.json b/converter/schemata/master-standalone-strict/configmapnodeconfigsource.json index f1d5f95..4bb2eb4 100644 --- a/converter/schemata/master-standalone-strict/configmapnodeconfigsource.json +++ b/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", diff --git a/converter/schemata/master-standalone-strict/configmapprojection.json b/converter/schemata/master-standalone-strict/configmapprojection.json index 21c9c1f..647b992 100644 --- a/converter/schemata/master-standalone-strict/configmapprojection.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/configmapvolumesource.json b/converter/schemata/master-standalone-strict/configmapvolumesource.json index c0f4fbf..7a37a39 100644 --- a/converter/schemata/master-standalone-strict/configmapvolumesource.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/containerstate.json b/converter/schemata/master-standalone-strict/containerstate.json index 895c6b3..53fdc87 100644 --- a/converter/schemata/master-standalone-strict/containerstate.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/containerstaterunning.json b/converter/schemata/master-standalone-strict/containerstaterunning.json index 5a8b016..26e849a 100644 --- a/converter/schemata/master-standalone-strict/containerstaterunning.json +++ b/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": { diff --git a/converter/schemata/master-standalone-strict/containerstatewaiting.json b/converter/schemata/master-standalone-strict/containerstatewaiting.json index 98eeba2..3136127 100644 --- a/converter/schemata/master-standalone-strict/containerstatewaiting.json +++ b/converter/schemata/master-standalone-strict/containerstatewaiting.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ContainerStateWaiting is a waiting state of a container.", "properties": { diff --git a/converter/schemata/master-standalone-strict/containerstatus.json b/converter/schemata/master-standalone-strict/containerstatus.json index 659c2ec..209b150 100644 --- a/converter/schemata/master-standalone-strict/containerstatus.json +++ b/converter/schemata/master-standalone-strict/containerstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "name", "ready", diff --git a/converter/schemata/master-standalone-strict/controllerrevision.json b/converter/schemata/master-standalone-strict/controllerrevision.json index 04475e4..da57857 100644 --- a/converter/schemata/master-standalone-strict/controllerrevision.json +++ b/converter/schemata/master-standalone-strict/controllerrevision.json @@ -10,7 +10,7 @@ "group": "apps" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "kind": { diff --git a/converter/schemata/master-standalone-strict/controllerrevisionlist.json b/converter/schemata/master-standalone-strict/controllerrevisionlist.json index 70d5a9d..2f0e04d 100644 --- a/converter/schemata/master-standalone-strict/controllerrevisionlist.json +++ b/converter/schemata/master-standalone-strict/controllerrevisionlist.json @@ -10,7 +10,7 @@ "group": "apps" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/cronjob.json b/converter/schemata/master-standalone-strict/cronjob.json index 32ad5c8..ed4e6ec 100644 --- a/converter/schemata/master-standalone-strict/cronjob.json +++ b/converter/schemata/master-standalone-strict/cronjob.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": "CronJob", diff --git a/converter/schemata/master-standalone-strict/cronjoblist.json b/converter/schemata/master-standalone-strict/cronjoblist.json index ab8e83e..a528d1d 100644 --- a/converter/schemata/master-standalone-strict/cronjoblist.json +++ b/converter/schemata/master-standalone-strict/cronjoblist.json @@ -10,7 +10,7 @@ "group": "batch" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/cronjobspec.json b/converter/schemata/master-standalone-strict/cronjobspec.json index b22ce32..06f47b7 100644 --- a/converter/schemata/master-standalone-strict/cronjobspec.json +++ b/converter/schemata/master-standalone-strict/cronjobspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "schedule", "jobTemplate" diff --git a/converter/schemata/master-standalone-strict/cronjobstatus.json b/converter/schemata/master-standalone-strict/cronjobstatus.json index d4b416b..ba4767e 100644 --- a/converter/schemata/master-standalone-strict/cronjobstatus.json +++ b/converter/schemata/master-standalone-strict/cronjobstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "CronJobStatus represents the current state of a cron job.", "properties": { diff --git a/converter/schemata/master-standalone-strict/crossversionobjectreference.json b/converter/schemata/master-standalone-strict/crossversionobjectreference.json index 4cf0292..148c7ba 100644 --- a/converter/schemata/master-standalone-strict/crossversionobjectreference.json +++ b/converter/schemata/master-standalone-strict/crossversionobjectreference.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "kind", "name" diff --git a/converter/schemata/master-standalone-strict/csipersistentvolumesource.json b/converter/schemata/master-standalone-strict/csipersistentvolumesource.json index 2750317..ffaed31 100644 --- a/converter/schemata/master-standalone-strict/csipersistentvolumesource.json +++ b/converter/schemata/master-standalone-strict/csipersistentvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "driver", "volumeHandle" diff --git a/converter/schemata/master-standalone-strict/customresourcecolumndefinition.json b/converter/schemata/master-standalone-strict/customresourcecolumndefinition.json index 0787602..a9de926 100644 --- a/converter/schemata/master-standalone-strict/customresourcecolumndefinition.json +++ b/converter/schemata/master-standalone-strict/customresourcecolumndefinition.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "name", "type", diff --git a/converter/schemata/master-standalone-strict/customresourcedefinitioncondition.json b/converter/schemata/master-standalone-strict/customresourcedefinitioncondition.json index 55f79b2..3dfb144 100644 --- a/converter/schemata/master-standalone-strict/customresourcedefinitioncondition.json +++ b/converter/schemata/master-standalone-strict/customresourcedefinitioncondition.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type", "status" diff --git a/converter/schemata/master-standalone-strict/customresourcedefinitionnames.json b/converter/schemata/master-standalone-strict/customresourcedefinitionnames.json index 9c1cfe1..4e02678 100644 --- a/converter/schemata/master-standalone-strict/customresourcedefinitionnames.json +++ b/converter/schemata/master-standalone-strict/customresourcedefinitionnames.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "plural", "kind" diff --git a/converter/schemata/master-standalone-strict/customresourcedefinitionstatus.json b/converter/schemata/master-standalone-strict/customresourcedefinitionstatus.json index 789dbef..775d937 100644 --- a/converter/schemata/master-standalone-strict/customresourcedefinitionstatus.json +++ b/converter/schemata/master-standalone-strict/customresourcedefinitionstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "conditions", "acceptedNames", diff --git a/converter/schemata/master-standalone-strict/customresourcedefinitionversion.json b/converter/schemata/master-standalone-strict/customresourcedefinitionversion.json index f6ebe0e..d690074 100644 --- a/converter/schemata/master-standalone-strict/customresourcedefinitionversion.json +++ b/converter/schemata/master-standalone-strict/customresourcedefinitionversion.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "name", "served", diff --git a/converter/schemata/master-standalone-strict/customresourcesubresources.json b/converter/schemata/master-standalone-strict/customresourcesubresources.json index c7d5762..cfab853 100644 --- a/converter/schemata/master-standalone-strict/customresourcesubresources.json +++ b/converter/schemata/master-standalone-strict/customresourcesubresources.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "CustomResourceSubresources defines the status and scale subresources for CustomResources.", "properties": { diff --git a/converter/schemata/master-standalone-strict/customresourcesubresourcescale.json b/converter/schemata/master-standalone-strict/customresourcesubresourcescale.json index 675da29..bcd48ad 100644 --- a/converter/schemata/master-standalone-strict/customresourcesubresourcescale.json +++ b/converter/schemata/master-standalone-strict/customresourcesubresourcescale.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "specReplicasPath", "statusReplicasPath" diff --git a/converter/schemata/master-standalone-strict/customresourcesubresourcestatus.json b/converter/schemata/master-standalone-strict/customresourcesubresourcestatus.json index f09629d..926d281 100644 --- a/converter/schemata/master-standalone-strict/customresourcesubresourcestatus.json +++ b/converter/schemata/master-standalone-strict/customresourcesubresourcestatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "CustomResourceSubresourceStatus defines how to serve the status subresource for CustomResources. Status is represented by the `.status` JSON path inside of a CustomResource. When set, * exposes a /status subresource for the custom resource * PUT requests to the /status subresource take a custom resource object, and ignore changes to anything except the status stanza * PUT/POST/PATCH requests to the custom resource ignore changes to the status stanza" } \ No newline at end of file diff --git a/converter/schemata/master-standalone-strict/daemonendpoint.json b/converter/schemata/master-standalone-strict/daemonendpoint.json index 5beb47b..5ffeb74 100644 --- a/converter/schemata/master-standalone-strict/daemonendpoint.json +++ b/converter/schemata/master-standalone-strict/daemonendpoint.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "Port" ], diff --git a/converter/schemata/master-standalone-strict/daemonsetcondition.json b/converter/schemata/master-standalone-strict/daemonsetcondition.json index ffc1fc2..e6b1cbe 100644 --- a/converter/schemata/master-standalone-strict/daemonsetcondition.json +++ b/converter/schemata/master-standalone-strict/daemonsetcondition.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type", "status" diff --git a/converter/schemata/master-standalone-strict/daemonsetlist.json b/converter/schemata/master-standalone-strict/daemonsetlist.json index 9f69b69..5eeb610 100644 --- a/converter/schemata/master-standalone-strict/daemonsetlist.json +++ b/converter/schemata/master-standalone-strict/daemonsetlist.json @@ -10,7 +10,7 @@ "group": "apps" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/daemonsetspec.json b/converter/schemata/master-standalone-strict/daemonsetspec.json index 1a15fce..9540596 100644 --- a/converter/schemata/master-standalone-strict/daemonsetspec.json +++ b/converter/schemata/master-standalone-strict/daemonsetspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "selector", "template" diff --git a/converter/schemata/master-standalone-strict/daemonsetstatus.json b/converter/schemata/master-standalone-strict/daemonsetstatus.json index 2eb9f24..b0e7a68 100644 --- a/converter/schemata/master-standalone-strict/daemonsetstatus.json +++ b/converter/schemata/master-standalone-strict/daemonsetstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "currentNumberScheduled", "numberMisscheduled", diff --git a/converter/schemata/master-standalone-strict/daemonsetupdatestrategy.json b/converter/schemata/master-standalone-strict/daemonsetupdatestrategy.json index b5420f2..603b3e0 100644 --- a/converter/schemata/master-standalone-strict/daemonsetupdatestrategy.json +++ b/converter/schemata/master-standalone-strict/daemonsetupdatestrategy.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "DaemonSetUpdateStrategy is a struct used to control the update strategy for a DaemonSet.", "properties": { diff --git a/converter/schemata/master-standalone-strict/deleteoptions.json b/converter/schemata/master-standalone-strict/deleteoptions.json index 1bfa64e..368756d 100644 --- a/converter/schemata/master-standalone-strict/deleteoptions.json +++ b/converter/schemata/master-standalone-strict/deleteoptions.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": "DeleteOptions", diff --git a/converter/schemata/master-standalone-strict/deploymentrollback.json b/converter/schemata/master-standalone-strict/deploymentrollback.json index c73868a..3f2e349 100644 --- a/converter/schemata/master-standalone-strict/deploymentrollback.json +++ b/converter/schemata/master-standalone-strict/deploymentrollback.json @@ -11,7 +11,7 @@ "group": "extensions" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "kind": { diff --git a/converter/schemata/master-standalone-strict/deploymentspec.json b/converter/schemata/master-standalone-strict/deploymentspec.json index 244708f..a5378d0 100644 --- a/converter/schemata/master-standalone-strict/deploymentspec.json +++ b/converter/schemata/master-standalone-strict/deploymentspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "selector", "template" diff --git a/converter/schemata/master-standalone-strict/deploymentstatus.json b/converter/schemata/master-standalone-strict/deploymentstatus.json index a2f203a..b18d381 100644 --- a/converter/schemata/master-standalone-strict/deploymentstatus.json +++ b/converter/schemata/master-standalone-strict/deploymentstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "DeploymentStatus is the most recently observed status of the Deployment.", "properties": { diff --git a/converter/schemata/master-standalone-strict/endpointslist.json b/converter/schemata/master-standalone-strict/endpointslist.json index 40b5f9c..b8c6eb0 100644 --- a/converter/schemata/master-standalone-strict/endpointslist.json +++ b/converter/schemata/master-standalone-strict/endpointslist.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": { diff --git a/converter/schemata/master-standalone-strict/endpointsubset.json b/converter/schemata/master-standalone-strict/endpointsubset.json index 4580b47..d683059 100644 --- a/converter/schemata/master-standalone-strict/endpointsubset.json +++ b/converter/schemata/master-standalone-strict/endpointsubset.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "EndpointSubset is a group of addresses with a common set of ports. The expanded set of endpoints is the Cartesian product of Addresses x Ports. For example, given:\n {\n Addresses: [{\"ip\": \"10.10.1.1\"}, {\"ip\": \"10.10.2.2\"}],\n Ports: [{\"name\": \"a\", \"port\": 8675}, {\"name\": \"b\", \"port\": 309}]\n }\nThe resulting set of endpoints can be viewed as:\n a: [ 10.10.1.1:8675, 10.10.2.2:8675 ],\n b: [ 10.10.1.1:309, 10.10.2.2:309 ]", "properties": { diff --git a/converter/schemata/master-standalone-strict/envfromsource.json b/converter/schemata/master-standalone-strict/envfromsource.json index 6cfe64d..3789685 100644 --- a/converter/schemata/master-standalone-strict/envfromsource.json +++ b/converter/schemata/master-standalone-strict/envfromsource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "EnvFromSource represents the source of a set of ConfigMaps", "properties": { diff --git a/converter/schemata/master-standalone-strict/eventseries.json b/converter/schemata/master-standalone-strict/eventseries.json index c577a96..5b25cd1 100644 --- a/converter/schemata/master-standalone-strict/eventseries.json +++ b/converter/schemata/master-standalone-strict/eventseries.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "EventSeries contain information on series of events, i.e. thing that was/is happening continuously for some time.", "properties": { diff --git a/converter/schemata/master-standalone-strict/eventsource.json b/converter/schemata/master-standalone-strict/eventsource.json index e911802..4611b2a 100644 --- a/converter/schemata/master-standalone-strict/eventsource.json +++ b/converter/schemata/master-standalone-strict/eventsource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "EventSource contains information for an event.", "properties": { diff --git a/converter/schemata/master-standalone-strict/execaction.json b/converter/schemata/master-standalone-strict/execaction.json index 7e63ada..b316bea 100644 --- a/converter/schemata/master-standalone-strict/execaction.json +++ b/converter/schemata/master-standalone-strict/execaction.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ExecAction describes a \"run in container\" action.", "properties": { diff --git a/converter/schemata/master-standalone-strict/externaldocumentation.json b/converter/schemata/master-standalone-strict/externaldocumentation.json index 4f0da63..12026d8 100644 --- a/converter/schemata/master-standalone-strict/externaldocumentation.json +++ b/converter/schemata/master-standalone-strict/externaldocumentation.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ExternalDocumentation allows referencing an external resource for extended documentation.", "properties": { diff --git a/converter/schemata/master-standalone-strict/externalmetricsource.json b/converter/schemata/master-standalone-strict/externalmetricsource.json index a9f2aa6..7390771 100644 --- a/converter/schemata/master-standalone-strict/externalmetricsource.json +++ b/converter/schemata/master-standalone-strict/externalmetricsource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "metricName" ], diff --git a/converter/schemata/master-standalone-strict/externalmetricstatus.json b/converter/schemata/master-standalone-strict/externalmetricstatus.json index af66068..51790d8 100644 --- a/converter/schemata/master-standalone-strict/externalmetricstatus.json +++ b/converter/schemata/master-standalone-strict/externalmetricstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "metricName", "currentValue" diff --git a/converter/schemata/master-standalone-strict/flexpersistentvolumesource.json b/converter/schemata/master-standalone-strict/flexpersistentvolumesource.json index 3e19a1f..5d8d198 100644 --- a/converter/schemata/master-standalone-strict/flexpersistentvolumesource.json +++ b/converter/schemata/master-standalone-strict/flexpersistentvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "driver" ], diff --git a/converter/schemata/master-standalone-strict/flockervolumesource.json b/converter/schemata/master-standalone-strict/flockervolumesource.json index 9ad604f..a04a33f 100644 --- a/converter/schemata/master-standalone-strict/flockervolumesource.json +++ b/converter/schemata/master-standalone-strict/flockervolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "Represents a Flocker volume mounted by the Flocker agent. One and only one of datasetName and datasetUUID should be set. Flocker volumes do not support ownership management or SELinux relabeling.", "properties": { diff --git a/converter/schemata/master-standalone-strict/fsgroupstrategyoptions.json b/converter/schemata/master-standalone-strict/fsgroupstrategyoptions.json index 38465a5..a8063de 100644 --- a/converter/schemata/master-standalone-strict/fsgroupstrategyoptions.json +++ b/converter/schemata/master-standalone-strict/fsgroupstrategyoptions.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "FSGroupStrategyOptions defines the strategy type and options used to create the strategy. Deprecated: use FSGroupStrategyOptions from policy API Group instead.", "properties": { diff --git a/converter/schemata/master-standalone-strict/gitrepovolumesource.json b/converter/schemata/master-standalone-strict/gitrepovolumesource.json index 6b96c41..6853570 100644 --- a/converter/schemata/master-standalone-strict/gitrepovolumesource.json +++ b/converter/schemata/master-standalone-strict/gitrepovolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "repository" ], diff --git a/converter/schemata/master-standalone-strict/groupversionfordiscovery.json b/converter/schemata/master-standalone-strict/groupversionfordiscovery.json index 59f419a..7ace91b 100644 --- a/converter/schemata/master-standalone-strict/groupversionfordiscovery.json +++ b/converter/schemata/master-standalone-strict/groupversionfordiscovery.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "groupVersion", "version" diff --git a/converter/schemata/master-standalone-strict/horizontalpodautoscaler.json b/converter/schemata/master-standalone-strict/horizontalpodautoscaler.json index 00b5351..263a0b0 100644 --- a/converter/schemata/master-standalone-strict/horizontalpodautoscaler.json +++ b/converter/schemata/master-standalone-strict/horizontalpodautoscaler.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": "HorizontalPodAutoscaler", diff --git a/converter/schemata/master-standalone-strict/horizontalpodautoscalercondition.json b/converter/schemata/master-standalone-strict/horizontalpodautoscalercondition.json index 5111932..6bce3c6 100644 --- a/converter/schemata/master-standalone-strict/horizontalpodautoscalercondition.json +++ b/converter/schemata/master-standalone-strict/horizontalpodautoscalercondition.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type", "status" diff --git a/converter/schemata/master-standalone-strict/horizontalpodautoscalerspec.json b/converter/schemata/master-standalone-strict/horizontalpodautoscalerspec.json index f50954f..3afb194 100644 --- a/converter/schemata/master-standalone-strict/horizontalpodautoscalerspec.json +++ b/converter/schemata/master-standalone-strict/horizontalpodautoscalerspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "scaleTargetRef", "maxReplicas" diff --git a/converter/schemata/master-standalone-strict/hostalias.json b/converter/schemata/master-standalone-strict/hostalias.json index 07e6445..98673d2 100644 --- a/converter/schemata/master-standalone-strict/hostalias.json +++ b/converter/schemata/master-standalone-strict/hostalias.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "HostAlias holds the mapping between IP and hostnames that will be injected as an entry in the pod's hosts file.", "properties": { diff --git a/converter/schemata/master-standalone-strict/hostpathvolumesource.json b/converter/schemata/master-standalone-strict/hostpathvolumesource.json index fbf8d23..e816fcf 100644 --- a/converter/schemata/master-standalone-strict/hostpathvolumesource.json +++ b/converter/schemata/master-standalone-strict/hostpathvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "path" ], diff --git a/converter/schemata/master-standalone-strict/hostportrange.json b/converter/schemata/master-standalone-strict/hostportrange.json index 885660c..32aa25c 100644 --- a/converter/schemata/master-standalone-strict/hostportrange.json +++ b/converter/schemata/master-standalone-strict/hostportrange.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "min", "max" diff --git a/converter/schemata/master-standalone-strict/info.json b/converter/schemata/master-standalone-strict/info.json index a65ce56..ac4999d 100644 --- a/converter/schemata/master-standalone-strict/info.json +++ b/converter/schemata/master-standalone-strict/info.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "major", "minor", diff --git a/converter/schemata/master-standalone-strict/ingress.json b/converter/schemata/master-standalone-strict/ingress.json index ab61640..822eab3 100644 --- a/converter/schemata/master-standalone-strict/ingress.json +++ b/converter/schemata/master-standalone-strict/ingress.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": "Ingress", diff --git a/converter/schemata/master-standalone-strict/ingressbackend.json b/converter/schemata/master-standalone-strict/ingressbackend.json index 1217dc2..22188fb 100644 --- a/converter/schemata/master-standalone-strict/ingressbackend.json +++ b/converter/schemata/master-standalone-strict/ingressbackend.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "serviceName", "servicePort" diff --git a/converter/schemata/master-standalone-strict/initializer.json b/converter/schemata/master-standalone-strict/initializer.json index 604f52e..6e47888 100644 --- a/converter/schemata/master-standalone-strict/initializer.json +++ b/converter/schemata/master-standalone-strict/initializer.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "name" ], diff --git a/converter/schemata/master-standalone-strict/initializerconfiguration.json b/converter/schemata/master-standalone-strict/initializerconfiguration.json index 51558c5..500a49a 100644 --- a/converter/schemata/master-standalone-strict/initializerconfiguration.json +++ b/converter/schemata/master-standalone-strict/initializerconfiguration.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": "InitializerConfiguration", diff --git a/converter/schemata/master-standalone-strict/initializerconfigurationlist.json b/converter/schemata/master-standalone-strict/initializerconfigurationlist.json index 0e56ec6..31c1865 100644 --- a/converter/schemata/master-standalone-strict/initializerconfigurationlist.json +++ b/converter/schemata/master-standalone-strict/initializerconfigurationlist.json @@ -10,7 +10,7 @@ "group": "admissionregistration.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/initializers.json b/converter/schemata/master-standalone-strict/initializers.json index 5074fb0..d205bcc 100644 --- a/converter/schemata/master-standalone-strict/initializers.json +++ b/converter/schemata/master-standalone-strict/initializers.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "pending" ], diff --git a/converter/schemata/master-standalone-strict/intorstring.json b/converter/schemata/master-standalone-strict/intorstring.json index b26a9d9..d9aa17e 100644 --- a/converter/schemata/master-standalone-strict/intorstring.json +++ b/converter/schemata/master-standalone-strict/intorstring.json @@ -8,5 +8,5 @@ } ], "type": "object", - "$schema": "http://json-schema.org/schema#" + "$schema": "https://json-schema.org/draft/2019-09/schema#" } \ No newline at end of file diff --git a/converter/schemata/master-standalone-strict/ipblock.json b/converter/schemata/master-standalone-strict/ipblock.json index f4b312e..6052efb 100644 --- a/converter/schemata/master-standalone-strict/ipblock.json +++ b/converter/schemata/master-standalone-strict/ipblock.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "cidr" ], diff --git a/converter/schemata/master-standalone-strict/iscsipersistentvolumesource.json b/converter/schemata/master-standalone-strict/iscsipersistentvolumesource.json index 28f786f..cf8130a 100644 --- a/converter/schemata/master-standalone-strict/iscsipersistentvolumesource.json +++ b/converter/schemata/master-standalone-strict/iscsipersistentvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "targetPortal", "iqn", diff --git a/converter/schemata/master-standalone-strict/jobtemplatespec.json b/converter/schemata/master-standalone-strict/jobtemplatespec.json index 8aa237c..8831f67 100644 --- a/converter/schemata/master-standalone-strict/jobtemplatespec.json +++ b/converter/schemata/master-standalone-strict/jobtemplatespec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "JobTemplateSpec describes the data a Job should have when created from a template", "properties": { diff --git a/converter/schemata/master-standalone-strict/json.json b/converter/schemata/master-standalone-strict/json.json index 2f3918a..250b694 100644 --- a/converter/schemata/master-standalone-strict/json.json +++ b/converter/schemata/master-standalone-strict/json.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "JSON represents any valid JSON value. These types are supported: bool, int64, float64, string, []interface{}, map[string]interface{} and nil." } \ No newline at end of file diff --git a/converter/schemata/master-standalone-strict/labelselector.json b/converter/schemata/master-standalone-strict/labelselector.json index a98bc0f..b8961d6 100644 --- a/converter/schemata/master-standalone-strict/labelselector.json +++ b/converter/schemata/master-standalone-strict/labelselector.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "A label selector is a label query over a set of resources. The result of matchLabels and matchExpressions are ANDed. An empty label selector matches all objects. A null label selector matches no objects.", "properties": { diff --git a/converter/schemata/master-standalone-strict/labelselectorrequirement.json b/converter/schemata/master-standalone-strict/labelselectorrequirement.json index c549e71..2a6f9c0 100644 --- a/converter/schemata/master-standalone-strict/labelselectorrequirement.json +++ b/converter/schemata/master-standalone-strict/labelselectorrequirement.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "key", "operator" diff --git a/converter/schemata/master-standalone-strict/lifecycle.json b/converter/schemata/master-standalone-strict/lifecycle.json index 7510f21..0b92e37 100644 --- a/converter/schemata/master-standalone-strict/lifecycle.json +++ b/converter/schemata/master-standalone-strict/lifecycle.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "Lifecycle describes actions that the management system should take in response to container lifecycle events. For the PostStart and PreStop lifecycle handlers, management of the container blocks until the action is complete, unless the container process fails, in which case the handler is aborted.", "properties": { diff --git a/converter/schemata/master-standalone-strict/limitrange.json b/converter/schemata/master-standalone-strict/limitrange.json index 975c2dc..cba65d6 100644 --- a/converter/schemata/master-standalone-strict/limitrange.json +++ b/converter/schemata/master-standalone-strict/limitrange.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": "LimitRange", diff --git a/converter/schemata/master-standalone-strict/limitrangelist.json b/converter/schemata/master-standalone-strict/limitrangelist.json index b571f32..b8b9f20 100644 --- a/converter/schemata/master-standalone-strict/limitrangelist.json +++ b/converter/schemata/master-standalone-strict/limitrangelist.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": { diff --git a/converter/schemata/master-standalone-strict/listmeta.json b/converter/schemata/master-standalone-strict/listmeta.json index 4fc6913..d6385b0 100644 --- a/converter/schemata/master-standalone-strict/listmeta.json +++ b/converter/schemata/master-standalone-strict/listmeta.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.", "properties": { diff --git a/converter/schemata/master-standalone-strict/localobjectreference.json b/converter/schemata/master-standalone-strict/localobjectreference.json index 0adab55..b8799b9 100644 --- a/converter/schemata/master-standalone-strict/localobjectreference.json +++ b/converter/schemata/master-standalone-strict/localobjectreference.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.", "properties": { diff --git a/converter/schemata/master-standalone-strict/localvolumesource.json b/converter/schemata/master-standalone-strict/localvolumesource.json index 83080dc..5e8d694 100644 --- a/converter/schemata/master-standalone-strict/localvolumesource.json +++ b/converter/schemata/master-standalone-strict/localvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "path" ], diff --git a/converter/schemata/master-standalone-strict/metricspec.json b/converter/schemata/master-standalone-strict/metricspec.json index 1534b06..9d17d2f 100644 --- a/converter/schemata/master-standalone-strict/metricspec.json +++ b/converter/schemata/master-standalone-strict/metricspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type" ], diff --git a/converter/schemata/master-standalone-strict/metricstatus.json b/converter/schemata/master-standalone-strict/metricstatus.json index e07d984..cde9e55 100644 --- a/converter/schemata/master-standalone-strict/metricstatus.json +++ b/converter/schemata/master-standalone-strict/metricstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type" ], diff --git a/converter/schemata/master-standalone-strict/microtime.json b/converter/schemata/master-standalone-strict/microtime.json index fc6d231..db539cb 100644 --- a/converter/schemata/master-standalone-strict/microtime.json +++ b/converter/schemata/master-standalone-strict/microtime.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "MicroTime is version of Time with microsecond level precision.", "format": "date-time" diff --git a/converter/schemata/master-standalone-strict/mutatingwebhookconfiguration.json b/converter/schemata/master-standalone-strict/mutatingwebhookconfiguration.json index 77aba87..e1bc29f 100644 --- a/converter/schemata/master-standalone-strict/mutatingwebhookconfiguration.json +++ b/converter/schemata/master-standalone-strict/mutatingwebhookconfiguration.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": "MutatingWebhookConfiguration", diff --git a/converter/schemata/master-standalone-strict/mutatingwebhookconfigurationlist.json b/converter/schemata/master-standalone-strict/mutatingwebhookconfigurationlist.json index 2121cdc..083cc4f 100644 --- a/converter/schemata/master-standalone-strict/mutatingwebhookconfigurationlist.json +++ b/converter/schemata/master-standalone-strict/mutatingwebhookconfigurationlist.json @@ -10,7 +10,7 @@ "group": "admissionregistration.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/namespacespec.json b/converter/schemata/master-standalone-strict/namespacespec.json index 3e0f099..eceb8b2 100644 --- a/converter/schemata/master-standalone-strict/namespacespec.json +++ b/converter/schemata/master-standalone-strict/namespacespec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "NamespaceSpec describes the attributes on a Namespace.", "properties": { diff --git a/converter/schemata/master-standalone-strict/networkpolicyegressrule.json b/converter/schemata/master-standalone-strict/networkpolicyegressrule.json index 6279be7..5ccab5d 100644 --- a/converter/schemata/master-standalone-strict/networkpolicyegressrule.json +++ b/converter/schemata/master-standalone-strict/networkpolicyegressrule.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "DEPRECATED 1.9 - This group version of NetworkPolicyEgressRule is deprecated by networking/v1/NetworkPolicyEgressRule. NetworkPolicyEgressRule describes a particular set of traffic that is allowed out of pods matched by a NetworkPolicySpec's podSelector. The traffic must match both ports and to. This type is beta-level in 1.8", "properties": { diff --git a/converter/schemata/master-standalone-strict/networkpolicyingressrule.json b/converter/schemata/master-standalone-strict/networkpolicyingressrule.json index 1ab1a30..546d10f 100644 --- a/converter/schemata/master-standalone-strict/networkpolicyingressrule.json +++ b/converter/schemata/master-standalone-strict/networkpolicyingressrule.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "NetworkPolicyIngressRule describes a particular set of traffic that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The traffic must match both ports and from.", "properties": { diff --git a/converter/schemata/master-standalone-strict/networkpolicylist.json b/converter/schemata/master-standalone-strict/networkpolicylist.json index 71fdba8..170939e 100644 --- a/converter/schemata/master-standalone-strict/networkpolicylist.json +++ b/converter/schemata/master-standalone-strict/networkpolicylist.json @@ -10,7 +10,7 @@ "group": "networking.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/nfsvolumesource.json b/converter/schemata/master-standalone-strict/nfsvolumesource.json index 1759369..4382ada 100644 --- a/converter/schemata/master-standalone-strict/nfsvolumesource.json +++ b/converter/schemata/master-standalone-strict/nfsvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "server", "path" diff --git a/converter/schemata/master-standalone-strict/nodeaddress.json b/converter/schemata/master-standalone-strict/nodeaddress.json index fc6dd19..1243b43 100644 --- a/converter/schemata/master-standalone-strict/nodeaddress.json +++ b/converter/schemata/master-standalone-strict/nodeaddress.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type", "address" diff --git a/converter/schemata/master-standalone-strict/nodecondition.json b/converter/schemata/master-standalone-strict/nodecondition.json index ca8653a..19c3d79 100644 --- a/converter/schemata/master-standalone-strict/nodecondition.json +++ b/converter/schemata/master-standalone-strict/nodecondition.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type", "status" diff --git a/converter/schemata/master-standalone-strict/nodeconfigsource.json b/converter/schemata/master-standalone-strict/nodeconfigsource.json index 423f56c..547f020 100644 --- a/converter/schemata/master-standalone-strict/nodeconfigsource.json +++ b/converter/schemata/master-standalone-strict/nodeconfigsource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "NodeConfigSource specifies a source of node configuration. Exactly one subfield (excluding metadata) must be non-nil.", "properties": { diff --git a/converter/schemata/master-standalone-strict/nodeconfigstatus.json b/converter/schemata/master-standalone-strict/nodeconfigstatus.json index ab18e35..3bf18f5 100644 --- a/converter/schemata/master-standalone-strict/nodeconfigstatus.json +++ b/converter/schemata/master-standalone-strict/nodeconfigstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "NodeConfigStatus describes the status of the config assigned by Node.Spec.ConfigSource.", "properties": { diff --git a/converter/schemata/master-standalone-strict/nodedaemonendpoints.json b/converter/schemata/master-standalone-strict/nodedaemonendpoints.json index f5f71f2..d008759 100644 --- a/converter/schemata/master-standalone-strict/nodedaemonendpoints.json +++ b/converter/schemata/master-standalone-strict/nodedaemonendpoints.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "NodeDaemonEndpoints lists ports opened by daemons running on the Node.", "properties": { diff --git a/converter/schemata/master-standalone-strict/nodeselector.json b/converter/schemata/master-standalone-strict/nodeselector.json index 00d2e45..47b0d39 100644 --- a/converter/schemata/master-standalone-strict/nodeselector.json +++ b/converter/schemata/master-standalone-strict/nodeselector.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "nodeSelectorTerms" ], diff --git a/converter/schemata/master-standalone-strict/nonresourceattributes.json b/converter/schemata/master-standalone-strict/nonresourceattributes.json index 24ad815..027e075 100644 --- a/converter/schemata/master-standalone-strict/nonresourceattributes.json +++ b/converter/schemata/master-standalone-strict/nonresourceattributes.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "NonResourceAttributes includes the authorization attributes available for non-resource requests to the Authorizer interface", "properties": { diff --git a/converter/schemata/master-standalone-strict/nonresourcerule.json b/converter/schemata/master-standalone-strict/nonresourcerule.json index 6aad8bc..c41f55e 100644 --- a/converter/schemata/master-standalone-strict/nonresourcerule.json +++ b/converter/schemata/master-standalone-strict/nonresourcerule.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "verbs" ], diff --git a/converter/schemata/master-standalone-strict/objectmeta.json b/converter/schemata/master-standalone-strict/objectmeta.json index ca7484e..b538c70 100644 --- a/converter/schemata/master-standalone-strict/objectmeta.json +++ b/converter/schemata/master-standalone-strict/objectmeta.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.", "properties": { diff --git a/converter/schemata/master-standalone-strict/objectmetricsource.json b/converter/schemata/master-standalone-strict/objectmetricsource.json index 3f2ed42..4790808 100644 --- a/converter/schemata/master-standalone-strict/objectmetricsource.json +++ b/converter/schemata/master-standalone-strict/objectmetricsource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "target", "metricName", diff --git a/converter/schemata/master-standalone-strict/objectmetricstatus.json b/converter/schemata/master-standalone-strict/objectmetricstatus.json index fa1dd87..ca0cb97 100644 --- a/converter/schemata/master-standalone-strict/objectmetricstatus.json +++ b/converter/schemata/master-standalone-strict/objectmetricstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "target", "metricName", diff --git a/converter/schemata/master-standalone-strict/ownerreference.json b/converter/schemata/master-standalone-strict/ownerreference.json index 285e180..ec6d4d7 100644 --- a/converter/schemata/master-standalone-strict/ownerreference.json +++ b/converter/schemata/master-standalone-strict/ownerreference.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "apiVersion", "kind", diff --git a/converter/schemata/master-standalone-strict/patch.json b/converter/schemata/master-standalone-strict/patch.json index 72573c1..9413a22 100644 --- a/converter/schemata/master-standalone-strict/patch.json +++ b/converter/schemata/master-standalone-strict/patch.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body." } \ No newline at end of file diff --git a/converter/schemata/master-standalone-strict/persistentvolume.json b/converter/schemata/master-standalone-strict/persistentvolume.json index ea0519f..2f84261 100644 --- a/converter/schemata/master-standalone-strict/persistentvolume.json +++ b/converter/schemata/master-standalone-strict/persistentvolume.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": "PersistentVolume", diff --git a/converter/schemata/master-standalone-strict/persistentvolumeclaim.json b/converter/schemata/master-standalone-strict/persistentvolumeclaim.json index 71e577b..c843a54 100644 --- a/converter/schemata/master-standalone-strict/persistentvolumeclaim.json +++ b/converter/schemata/master-standalone-strict/persistentvolumeclaim.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": "PersistentVolumeClaim", diff --git a/converter/schemata/master-standalone-strict/persistentvolumeclaimcondition.json b/converter/schemata/master-standalone-strict/persistentvolumeclaimcondition.json index bf8af90..7b2a200 100644 --- a/converter/schemata/master-standalone-strict/persistentvolumeclaimcondition.json +++ b/converter/schemata/master-standalone-strict/persistentvolumeclaimcondition.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type", "status" diff --git a/converter/schemata/master-standalone-strict/persistentvolumestatus.json b/converter/schemata/master-standalone-strict/persistentvolumestatus.json index 7e45f97..0b7a689 100644 --- a/converter/schemata/master-standalone-strict/persistentvolumestatus.json +++ b/converter/schemata/master-standalone-strict/persistentvolumestatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "PersistentVolumeStatus is the current status of a persistent volume.", "properties": { diff --git a/converter/schemata/master-standalone-strict/podaffinity.json b/converter/schemata/master-standalone-strict/podaffinity.json index 0b06e7d..0d11319 100644 --- a/converter/schemata/master-standalone-strict/podaffinity.json +++ b/converter/schemata/master-standalone-strict/podaffinity.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "Pod affinity is a group of inter pod affinity scheduling rules.", "properties": { diff --git a/converter/schemata/master-standalone-strict/podaffinityterm.json b/converter/schemata/master-standalone-strict/podaffinityterm.json index 3bb3267..c32c8d8 100644 --- a/converter/schemata/master-standalone-strict/podaffinityterm.json +++ b/converter/schemata/master-standalone-strict/podaffinityterm.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "topologyKey" ], diff --git a/converter/schemata/master-standalone-strict/podcondition.json b/converter/schemata/master-standalone-strict/podcondition.json index 780ea21..0ecdffe 100644 --- a/converter/schemata/master-standalone-strict/podcondition.json +++ b/converter/schemata/master-standalone-strict/podcondition.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type", "status" diff --git a/converter/schemata/master-standalone-strict/poddisruptionbudget.json b/converter/schemata/master-standalone-strict/poddisruptionbudget.json index 022a442..d1afce7 100644 --- a/converter/schemata/master-standalone-strict/poddisruptionbudget.json +++ b/converter/schemata/master-standalone-strict/poddisruptionbudget.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": "PodDisruptionBudget", diff --git a/converter/schemata/master-standalone-strict/poddisruptionbudgetspec.json b/converter/schemata/master-standalone-strict/poddisruptionbudgetspec.json index e81ef9c..1fda580 100644 --- a/converter/schemata/master-standalone-strict/poddisruptionbudgetspec.json +++ b/converter/schemata/master-standalone-strict/poddisruptionbudgetspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.", "properties": { diff --git a/converter/schemata/master-standalone-strict/poddisruptionbudgetstatus.json b/converter/schemata/master-standalone-strict/poddisruptionbudgetstatus.json index 6dd2a3e..e6856b0 100644 --- a/converter/schemata/master-standalone-strict/poddisruptionbudgetstatus.json +++ b/converter/schemata/master-standalone-strict/poddisruptionbudgetstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "disruptedPods", "disruptionsAllowed", diff --git a/converter/schemata/master-standalone-strict/poddnsconfig.json b/converter/schemata/master-standalone-strict/poddnsconfig.json index 8afe146..161b835 100644 --- a/converter/schemata/master-standalone-strict/poddnsconfig.json +++ b/converter/schemata/master-standalone-strict/poddnsconfig.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "PodDNSConfig defines the DNS parameters of a pod in addition to those generated from DNSPolicy.", "properties": { diff --git a/converter/schemata/master-standalone-strict/poddnsconfigoption.json b/converter/schemata/master-standalone-strict/poddnsconfigoption.json index 8792b74..c3d5458 100644 --- a/converter/schemata/master-standalone-strict/poddnsconfigoption.json +++ b/converter/schemata/master-standalone-strict/poddnsconfigoption.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "PodDNSConfigOption defines DNS resolver options of a pod.", "properties": { diff --git a/converter/schemata/master-standalone-strict/podpresetlist.json b/converter/schemata/master-standalone-strict/podpresetlist.json index 9f3fff5..6246465 100644 --- a/converter/schemata/master-standalone-strict/podpresetlist.json +++ b/converter/schemata/master-standalone-strict/podpresetlist.json @@ -10,7 +10,7 @@ "group": "settings.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/podreadinessgate.json b/converter/schemata/master-standalone-strict/podreadinessgate.json index 5fab6e3..2097898 100644 --- a/converter/schemata/master-standalone-strict/podreadinessgate.json +++ b/converter/schemata/master-standalone-strict/podreadinessgate.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "conditionType" ], diff --git a/converter/schemata/master-standalone-strict/podsecuritycontext.json b/converter/schemata/master-standalone-strict/podsecuritycontext.json index bf11dc0..84d0490 100644 --- a/converter/schemata/master-standalone-strict/podsecuritycontext.json +++ b/converter/schemata/master-standalone-strict/podsecuritycontext.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "PodSecurityContext holds pod-level security attributes and common container settings. Some fields are also present in container.securityContext. Field values of container.securityContext take precedence over field values of PodSecurityContext.", "properties": { diff --git a/converter/schemata/master-standalone-strict/podsecuritypolicy.json b/converter/schemata/master-standalone-strict/podsecuritypolicy.json index 7f67a4c..c1b0f0e 100644 --- a/converter/schemata/master-standalone-strict/podsecuritypolicy.json +++ b/converter/schemata/master-standalone-strict/podsecuritypolicy.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": "PodSecurityPolicy", diff --git a/converter/schemata/master-standalone-strict/podsecuritypolicylist.json b/converter/schemata/master-standalone-strict/podsecuritypolicylist.json index f8c4e96..35c5b32 100644 --- a/converter/schemata/master-standalone-strict/podsecuritypolicylist.json +++ b/converter/schemata/master-standalone-strict/podsecuritypolicylist.json @@ -10,7 +10,7 @@ "group": "extensions" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/podsmetricsource.json b/converter/schemata/master-standalone-strict/podsmetricsource.json index 06f2c77..2d867d7 100644 --- a/converter/schemata/master-standalone-strict/podsmetricsource.json +++ b/converter/schemata/master-standalone-strict/podsmetricsource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "metricName", "targetAverageValue" diff --git a/converter/schemata/master-standalone-strict/podsmetricstatus.json b/converter/schemata/master-standalone-strict/podsmetricstatus.json index d43f4bf..9d97e88 100644 --- a/converter/schemata/master-standalone-strict/podsmetricstatus.json +++ b/converter/schemata/master-standalone-strict/podsmetricstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "metricName", "currentAverageValue" diff --git a/converter/schemata/master-standalone-strict/policyrule.json b/converter/schemata/master-standalone-strict/policyrule.json index d499e5e..5a355fc 100644 --- a/converter/schemata/master-standalone-strict/policyrule.json +++ b/converter/schemata/master-standalone-strict/policyrule.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "verbs" ], diff --git a/converter/schemata/master-standalone-strict/preconditions.json b/converter/schemata/master-standalone-strict/preconditions.json index db4ca04..94a901a 100644 --- a/converter/schemata/master-standalone-strict/preconditions.json +++ b/converter/schemata/master-standalone-strict/preconditions.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out.", "properties": { diff --git a/converter/schemata/master-standalone-strict/priorityclass.json b/converter/schemata/master-standalone-strict/priorityclass.json index 437061d..01a4d91 100644 --- a/converter/schemata/master-standalone-strict/priorityclass.json +++ b/converter/schemata/master-standalone-strict/priorityclass.json @@ -10,7 +10,7 @@ "group": "scheduling.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "kind": { diff --git a/converter/schemata/master-standalone-strict/priorityclasslist.json b/converter/schemata/master-standalone-strict/priorityclasslist.json index 960ac70..a2071bb 100644 --- a/converter/schemata/master-standalone-strict/priorityclasslist.json +++ b/converter/schemata/master-standalone-strict/priorityclasslist.json @@ -10,7 +10,7 @@ "group": "scheduling.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/probe.json b/converter/schemata/master-standalone-strict/probe.json index 6ee4da8..f329137 100644 --- a/converter/schemata/master-standalone-strict/probe.json +++ b/converter/schemata/master-standalone-strict/probe.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "Probe describes a health check to be performed against a container to determine whether it is alive or ready to receive traffic.", "properties": { diff --git a/converter/schemata/master-standalone-strict/quantity.json b/converter/schemata/master-standalone-strict/quantity.json index b26a9d9..d9aa17e 100644 --- a/converter/schemata/master-standalone-strict/quantity.json +++ b/converter/schemata/master-standalone-strict/quantity.json @@ -8,5 +8,5 @@ } ], "type": "object", - "$schema": "http://json-schema.org/schema#" + "$schema": "https://json-schema.org/draft/2019-09/schema#" } \ No newline at end of file diff --git a/converter/schemata/master-standalone-strict/rawextension.json b/converter/schemata/master-standalone-strict/rawextension.json index 27320d0..4e7386f 100644 --- a/converter/schemata/master-standalone-strict/rawextension.json +++ b/converter/schemata/master-standalone-strict/rawextension.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "Raw" ], diff --git a/converter/schemata/master-standalone-strict/rbdpersistentvolumesource.json b/converter/schemata/master-standalone-strict/rbdpersistentvolumesource.json index 5b75468..b4cc2dd 100644 --- a/converter/schemata/master-standalone-strict/rbdpersistentvolumesource.json +++ b/converter/schemata/master-standalone-strict/rbdpersistentvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "monitors", "image" diff --git a/converter/schemata/master-standalone-strict/rbdvolumesource.json b/converter/schemata/master-standalone-strict/rbdvolumesource.json index cf64082..0c30213 100644 --- a/converter/schemata/master-standalone-strict/rbdvolumesource.json +++ b/converter/schemata/master-standalone-strict/rbdvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "monitors", "image" diff --git a/converter/schemata/master-standalone-strict/replicaset.json b/converter/schemata/master-standalone-strict/replicaset.json index c293217..5d03305 100644 --- a/converter/schemata/master-standalone-strict/replicaset.json +++ b/converter/schemata/master-standalone-strict/replicaset.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": "ReplicaSet", diff --git a/converter/schemata/master-standalone-strict/replicasetlist.json b/converter/schemata/master-standalone-strict/replicasetlist.json index 0ca2a71..47d7b3a 100644 --- a/converter/schemata/master-standalone-strict/replicasetlist.json +++ b/converter/schemata/master-standalone-strict/replicasetlist.json @@ -10,7 +10,7 @@ "group": "apps" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/replicasetspec.json b/converter/schemata/master-standalone-strict/replicasetspec.json index 7b3b375..f4d4ced 100644 --- a/converter/schemata/master-standalone-strict/replicasetspec.json +++ b/converter/schemata/master-standalone-strict/replicasetspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ReplicaSetSpec is the specification of a ReplicaSet.", "properties": { diff --git a/converter/schemata/master-standalone-strict/replicationcontroller.json b/converter/schemata/master-standalone-strict/replicationcontroller.json index 6a5f550..6a319c7 100644 --- a/converter/schemata/master-standalone-strict/replicationcontroller.json +++ b/converter/schemata/master-standalone-strict/replicationcontroller.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": "ReplicationController", diff --git a/converter/schemata/master-standalone-strict/replicationcontrollerspec.json b/converter/schemata/master-standalone-strict/replicationcontrollerspec.json index c63dae0..28687fe 100644 --- a/converter/schemata/master-standalone-strict/replicationcontrollerspec.json +++ b/converter/schemata/master-standalone-strict/replicationcontrollerspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ReplicationControllerSpec is the specification of a replication controller.", "properties": { diff --git a/converter/schemata/master-standalone-strict/replicationcontrollerstatus.json b/converter/schemata/master-standalone-strict/replicationcontrollerstatus.json index ef3d018..0da3528 100644 --- a/converter/schemata/master-standalone-strict/replicationcontrollerstatus.json +++ b/converter/schemata/master-standalone-strict/replicationcontrollerstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "replicas" ], diff --git a/converter/schemata/master-standalone-strict/resourcemetricsource.json b/converter/schemata/master-standalone-strict/resourcemetricsource.json index 0a7a935..2f33e73 100644 --- a/converter/schemata/master-standalone-strict/resourcemetricsource.json +++ b/converter/schemata/master-standalone-strict/resourcemetricsource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "name" ], diff --git a/converter/schemata/master-standalone-strict/resourcemetricstatus.json b/converter/schemata/master-standalone-strict/resourcemetricstatus.json index e4fdc47..c23ca49 100644 --- a/converter/schemata/master-standalone-strict/resourcemetricstatus.json +++ b/converter/schemata/master-standalone-strict/resourcemetricstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "name", "currentAverageValue" diff --git a/converter/schemata/master-standalone-strict/resourcequotastatus.json b/converter/schemata/master-standalone-strict/resourcequotastatus.json index 260dd05..50ddb64 100644 --- a/converter/schemata/master-standalone-strict/resourcequotastatus.json +++ b/converter/schemata/master-standalone-strict/resourcequotastatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ResourceQuotaStatus defines the enforced hard limits and observed use.", "properties": { diff --git a/converter/schemata/master-standalone-strict/resourcerequirements.json b/converter/schemata/master-standalone-strict/resourcerequirements.json index ab9ca46..882c0a4 100644 --- a/converter/schemata/master-standalone-strict/resourcerequirements.json +++ b/converter/schemata/master-standalone-strict/resourcerequirements.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ResourceRequirements describes the compute resource requirements.", "properties": { diff --git a/converter/schemata/master-standalone-strict/resourcerule.json b/converter/schemata/master-standalone-strict/resourcerule.json index 5ba4f39..044924b 100644 --- a/converter/schemata/master-standalone-strict/resourcerule.json +++ b/converter/schemata/master-standalone-strict/resourcerule.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "verbs" ], diff --git a/converter/schemata/master-standalone-strict/role.json b/converter/schemata/master-standalone-strict/role.json index f55924b..70d6206 100644 --- a/converter/schemata/master-standalone-strict/role.json +++ b/converter/schemata/master-standalone-strict/role.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": { "rules": { diff --git a/converter/schemata/master-standalone-strict/rolebinding.json b/converter/schemata/master-standalone-strict/rolebinding.json index 0fdf6ee..63dddb0 100644 --- a/converter/schemata/master-standalone-strict/rolebinding.json +++ b/converter/schemata/master-standalone-strict/rolebinding.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": { "roleRef": { diff --git a/converter/schemata/master-standalone-strict/rolelist.json b/converter/schemata/master-standalone-strict/rolelist.json index f2111f7..ffcd1a9 100644 --- a/converter/schemata/master-standalone-strict/rolelist.json +++ b/converter/schemata/master-standalone-strict/rolelist.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": { diff --git a/converter/schemata/master-standalone-strict/roleref.json b/converter/schemata/master-standalone-strict/roleref.json index 5f675de..700638d 100644 --- a/converter/schemata/master-standalone-strict/roleref.json +++ b/converter/schemata/master-standalone-strict/roleref.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "apiGroup", "kind", diff --git a/converter/schemata/master-standalone-strict/rollingupdatedaemonset.json b/converter/schemata/master-standalone-strict/rollingupdatedaemonset.json index b13933b..92a35fd 100644 --- a/converter/schemata/master-standalone-strict/rollingupdatedaemonset.json +++ b/converter/schemata/master-standalone-strict/rollingupdatedaemonset.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "Spec to control the desired behavior of daemon set rolling update.", "properties": { diff --git a/converter/schemata/master-standalone-strict/rollingupdatedeployment.json b/converter/schemata/master-standalone-strict/rollingupdatedeployment.json index 6eb6854..8f0ad8e 100644 --- a/converter/schemata/master-standalone-strict/rollingupdatedeployment.json +++ b/converter/schemata/master-standalone-strict/rollingupdatedeployment.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "Spec to control the desired behavior of rolling update.", "properties": { diff --git a/converter/schemata/master-standalone-strict/rollingupdatestatefulsetstrategy.json b/converter/schemata/master-standalone-strict/rollingupdatestatefulsetstrategy.json index 988365e..16fc00e 100644 --- a/converter/schemata/master-standalone-strict/rollingupdatestatefulsetstrategy.json +++ b/converter/schemata/master-standalone-strict/rollingupdatestatefulsetstrategy.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "RollingUpdateStatefulSetStrategy is used to communicate parameter for RollingUpdateStatefulSetStrategyType.", "properties": { diff --git a/converter/schemata/master-standalone-strict/rulewithoperations.json b/converter/schemata/master-standalone-strict/rulewithoperations.json index 73bd7df..814b609 100644 --- a/converter/schemata/master-standalone-strict/rulewithoperations.json +++ b/converter/schemata/master-standalone-strict/rulewithoperations.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "RuleWithOperations is a tuple of Operations and Resources. It is recommended to make sure that all the tuple expansions are valid.", "properties": { diff --git a/converter/schemata/master-standalone-strict/runasuserstrategyoptions.json b/converter/schemata/master-standalone-strict/runasuserstrategyoptions.json index 0b0c1fb..f7534e9 100644 --- a/converter/schemata/master-standalone-strict/runasuserstrategyoptions.json +++ b/converter/schemata/master-standalone-strict/runasuserstrategyoptions.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "rule" ], diff --git a/converter/schemata/master-standalone-strict/scale.json b/converter/schemata/master-standalone-strict/scale.json index 3713f26..c58439a 100644 --- a/converter/schemata/master-standalone-strict/scale.json +++ b/converter/schemata/master-standalone-strict/scale.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": "Scale", diff --git a/converter/schemata/master-standalone-strict/scaleiopersistentvolumesource.json b/converter/schemata/master-standalone-strict/scaleiopersistentvolumesource.json index 0c202ba..f01da21 100644 --- a/converter/schemata/master-standalone-strict/scaleiopersistentvolumesource.json +++ b/converter/schemata/master-standalone-strict/scaleiopersistentvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "gateway", "system", diff --git a/converter/schemata/master-standalone-strict/scaleiovolumesource.json b/converter/schemata/master-standalone-strict/scaleiovolumesource.json index 15396ee..5054b89 100644 --- a/converter/schemata/master-standalone-strict/scaleiovolumesource.json +++ b/converter/schemata/master-standalone-strict/scaleiovolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "gateway", "system", diff --git a/converter/schemata/master-standalone-strict/scalespec.json b/converter/schemata/master-standalone-strict/scalespec.json index c56bce0..a86be05 100644 --- a/converter/schemata/master-standalone-strict/scalespec.json +++ b/converter/schemata/master-standalone-strict/scalespec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ScaleSpec describes the attributes of a scale subresource", "properties": { diff --git a/converter/schemata/master-standalone-strict/scopedresourceselectorrequirement.json b/converter/schemata/master-standalone-strict/scopedresourceselectorrequirement.json index 1372c8e..38d63c5 100644 --- a/converter/schemata/master-standalone-strict/scopedresourceselectorrequirement.json +++ b/converter/schemata/master-standalone-strict/scopedresourceselectorrequirement.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "scopeName", "operator" diff --git a/converter/schemata/master-standalone-strict/scopeselector.json b/converter/schemata/master-standalone-strict/scopeselector.json index 715d6d1..b0f04f4 100644 --- a/converter/schemata/master-standalone-strict/scopeselector.json +++ b/converter/schemata/master-standalone-strict/scopeselector.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "A scope selector represents the AND of the selectors represented by the scoped-resource selector requirements.", "properties": { diff --git a/converter/schemata/master-standalone-strict/secret.json b/converter/schemata/master-standalone-strict/secret.json index e16babb..7eae70b 100644 --- a/converter/schemata/master-standalone-strict/secret.json +++ b/converter/schemata/master-standalone-strict/secret.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": "Secret", diff --git a/converter/schemata/master-standalone-strict/secretreference.json b/converter/schemata/master-standalone-strict/secretreference.json index 799b863..a7eb93c 100644 --- a/converter/schemata/master-standalone-strict/secretreference.json +++ b/converter/schemata/master-standalone-strict/secretreference.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "SecretReference represents a Secret Reference. It has enough information to retrieve secret in any namespace", "properties": { diff --git a/converter/schemata/master-standalone-strict/securitycontext.json b/converter/schemata/master-standalone-strict/securitycontext.json index 3fda023..403e0de 100644 --- a/converter/schemata/master-standalone-strict/securitycontext.json +++ b/converter/schemata/master-standalone-strict/securitycontext.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "SecurityContext holds security configuration that will be applied to a container. Some fields are present in both SecurityContext and PodSecurityContext. When both are set, the values in SecurityContext take precedence.", "properties": { diff --git a/converter/schemata/master-standalone-strict/selfsubjectaccessreviewspec.json b/converter/schemata/master-standalone-strict/selfsubjectaccessreviewspec.json index b87060f..ad15ce6 100644 --- a/converter/schemata/master-standalone-strict/selfsubjectaccessreviewspec.json +++ b/converter/schemata/master-standalone-strict/selfsubjectaccessreviewspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "SelfSubjectAccessReviewSpec is a description of the access request. Exactly one of ResourceAuthorizationAttributes and NonResourceAuthorizationAttributes must be set", "properties": { diff --git a/converter/schemata/master-standalone-strict/selfsubjectrulesreview.json b/converter/schemata/master-standalone-strict/selfsubjectrulesreview.json index ddf4ec4..c3f1767 100644 --- a/converter/schemata/master-standalone-strict/selfsubjectrulesreview.json +++ b/converter/schemata/master-standalone-strict/selfsubjectrulesreview.json @@ -10,7 +10,7 @@ "group": "authorization.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "status": { diff --git a/converter/schemata/master-standalone-strict/selfsubjectrulesreviewspec.json b/converter/schemata/master-standalone-strict/selfsubjectrulesreviewspec.json index ddb1c61..47c5170 100644 --- a/converter/schemata/master-standalone-strict/selfsubjectrulesreviewspec.json +++ b/converter/schemata/master-standalone-strict/selfsubjectrulesreviewspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "namespace": { diff --git a/converter/schemata/master-standalone-strict/selinuxoptions.json b/converter/schemata/master-standalone-strict/selinuxoptions.json index 1a7c391..2930529 100644 --- a/converter/schemata/master-standalone-strict/selinuxoptions.json +++ b/converter/schemata/master-standalone-strict/selinuxoptions.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "SELinuxOptions are the labels to be applied to the container", "properties": { diff --git a/converter/schemata/master-standalone-strict/selinuxstrategyoptions.json b/converter/schemata/master-standalone-strict/selinuxstrategyoptions.json index eca05bd..8f64547 100644 --- a/converter/schemata/master-standalone-strict/selinuxstrategyoptions.json +++ b/converter/schemata/master-standalone-strict/selinuxstrategyoptions.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "rule" ], diff --git a/converter/schemata/master-standalone-strict/serveraddressbyclientcidr.json b/converter/schemata/master-standalone-strict/serveraddressbyclientcidr.json index 54f9f3a..ba4bc87 100644 --- a/converter/schemata/master-standalone-strict/serveraddressbyclientcidr.json +++ b/converter/schemata/master-standalone-strict/serveraddressbyclientcidr.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "clientCIDR", "serverAddress" diff --git a/converter/schemata/master-standalone-strict/service.json b/converter/schemata/master-standalone-strict/service.json index 33b8004..3ffabb3 100644 --- a/converter/schemata/master-standalone-strict/service.json +++ b/converter/schemata/master-standalone-strict/service.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": "Service", diff --git a/converter/schemata/master-standalone-strict/serviceaccountlist.json b/converter/schemata/master-standalone-strict/serviceaccountlist.json index f4f27ed..45887ba 100644 --- a/converter/schemata/master-standalone-strict/serviceaccountlist.json +++ b/converter/schemata/master-standalone-strict/serviceaccountlist.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": { diff --git a/converter/schemata/master-standalone-strict/serviceaccounttokenprojection.json b/converter/schemata/master-standalone-strict/serviceaccounttokenprojection.json index ab4b160..5891946 100644 --- a/converter/schemata/master-standalone-strict/serviceaccounttokenprojection.json +++ b/converter/schemata/master-standalone-strict/serviceaccounttokenprojection.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "path" ], diff --git a/converter/schemata/master-standalone-strict/serviceport.json b/converter/schemata/master-standalone-strict/serviceport.json index 1e1e126..20d12f0 100644 --- a/converter/schemata/master-standalone-strict/serviceport.json +++ b/converter/schemata/master-standalone-strict/serviceport.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "port" ], diff --git a/converter/schemata/master-standalone-strict/servicereference.json b/converter/schemata/master-standalone-strict/servicereference.json index a60e64b..6b56e71 100644 --- a/converter/schemata/master-standalone-strict/servicereference.json +++ b/converter/schemata/master-standalone-strict/servicereference.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ServiceReference holds a reference to Service.legacy.k8s.io", "properties": { diff --git a/converter/schemata/master-standalone-strict/servicespec.json b/converter/schemata/master-standalone-strict/servicespec.json index cfbdab4..43d6753 100644 --- a/converter/schemata/master-standalone-strict/servicespec.json +++ b/converter/schemata/master-standalone-strict/servicespec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ServiceSpec describes the attributes that a user creates on a service.", "properties": { diff --git a/converter/schemata/master-standalone-strict/servicestatus.json b/converter/schemata/master-standalone-strict/servicestatus.json index 5c1a548..8d1f758 100644 --- a/converter/schemata/master-standalone-strict/servicestatus.json +++ b/converter/schemata/master-standalone-strict/servicestatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "ServiceStatus represents the current status of a service.", "properties": { diff --git a/converter/schemata/master-standalone-strict/sessionaffinityconfig.json b/converter/schemata/master-standalone-strict/sessionaffinityconfig.json index e208a73..98f278c 100644 --- a/converter/schemata/master-standalone-strict/sessionaffinityconfig.json +++ b/converter/schemata/master-standalone-strict/sessionaffinityconfig.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "SessionAffinityConfig represents the configurations of session affinity.", "properties": { diff --git a/converter/schemata/master-standalone-strict/statefulset.json b/converter/schemata/master-standalone-strict/statefulset.json index a9f0412..cc2bd61 100644 --- a/converter/schemata/master-standalone-strict/statefulset.json +++ b/converter/schemata/master-standalone-strict/statefulset.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": "StatefulSet", diff --git a/converter/schemata/master-standalone-strict/statefulsetcondition.json b/converter/schemata/master-standalone-strict/statefulsetcondition.json index 3a896c5..b726c44 100644 --- a/converter/schemata/master-standalone-strict/statefulsetcondition.json +++ b/converter/schemata/master-standalone-strict/statefulsetcondition.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "type", "status" diff --git a/converter/schemata/master-standalone-strict/statefulsetlist.json b/converter/schemata/master-standalone-strict/statefulsetlist.json index 7fef0c1..52d93a6 100644 --- a/converter/schemata/master-standalone-strict/statefulsetlist.json +++ b/converter/schemata/master-standalone-strict/statefulsetlist.json @@ -10,7 +10,7 @@ "group": "apps" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/statefulsetstatus.json b/converter/schemata/master-standalone-strict/statefulsetstatus.json index c4a8af8..8d23130 100644 --- a/converter/schemata/master-standalone-strict/statefulsetstatus.json +++ b/converter/schemata/master-standalone-strict/statefulsetstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "replicas" ], diff --git a/converter/schemata/master-standalone-strict/statefulsetupdatestrategy.json b/converter/schemata/master-standalone-strict/statefulsetupdatestrategy.json index 3a01251..4970ae9 100644 --- a/converter/schemata/master-standalone-strict/statefulsetupdatestrategy.json +++ b/converter/schemata/master-standalone-strict/statefulsetupdatestrategy.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "StatefulSetUpdateStrategy indicates the strategy that the StatefulSet controller will use to perform updates. It includes any additional parameters necessary to perform the update for the indicated strategy.", "properties": { diff --git a/converter/schemata/master-standalone-strict/status.json b/converter/schemata/master-standalone-strict/status.json index bb7b940..f35c0b0 100644 --- a/converter/schemata/master-standalone-strict/status.json +++ b/converter/schemata/master-standalone-strict/status.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": "Status", diff --git a/converter/schemata/master-standalone-strict/statuscause.json b/converter/schemata/master-standalone-strict/statuscause.json index 5960c39..77fa722 100644 --- a/converter/schemata/master-standalone-strict/statuscause.json +++ b/converter/schemata/master-standalone-strict/statuscause.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.", "properties": { diff --git a/converter/schemata/master-standalone-strict/statusdetails.json b/converter/schemata/master-standalone-strict/statusdetails.json index 94942ac..a6bab65 100644 --- a/converter/schemata/master-standalone-strict/statusdetails.json +++ b/converter/schemata/master-standalone-strict/statusdetails.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "StatusDetails is a set of additional properties that MAY be set by the server to provide additional information about a response. The Reason field of a Status object defines what attributes will be set. Clients must ignore fields that do not match the defined type of each attribute, and should assume that any attribute may be empty, invalid, or under defined.", "properties": { diff --git a/converter/schemata/master-standalone-strict/storageclass.json b/converter/schemata/master-standalone-strict/storageclass.json index 79d30e7..285e477 100644 --- a/converter/schemata/master-standalone-strict/storageclass.json +++ b/converter/schemata/master-standalone-strict/storageclass.json @@ -10,7 +10,7 @@ "group": "storage.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "allowedTopologies": { diff --git a/converter/schemata/master-standalone-strict/subject.json b/converter/schemata/master-standalone-strict/subject.json index 086a8ad..72f8ace 100644 --- a/converter/schemata/master-standalone-strict/subject.json +++ b/converter/schemata/master-standalone-strict/subject.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "kind", "name" diff --git a/converter/schemata/master-standalone-strict/subjectaccessreview.json b/converter/schemata/master-standalone-strict/subjectaccessreview.json index d78b91a..8d80c4a 100644 --- a/converter/schemata/master-standalone-strict/subjectaccessreview.json +++ b/converter/schemata/master-standalone-strict/subjectaccessreview.json @@ -10,7 +10,7 @@ "group": "authorization.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "status": { diff --git a/converter/schemata/master-standalone-strict/subjectaccessreviewstatus.json b/converter/schemata/master-standalone-strict/subjectaccessreviewstatus.json index 0c6e1ce..94442b7 100644 --- a/converter/schemata/master-standalone-strict/subjectaccessreviewstatus.json +++ b/converter/schemata/master-standalone-strict/subjectaccessreviewstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "allowed" ], diff --git a/converter/schemata/master-standalone-strict/subjectrulesreviewstatus.json b/converter/schemata/master-standalone-strict/subjectrulesreviewstatus.json index 2f080e7..9a378e1 100644 --- a/converter/schemata/master-standalone-strict/subjectrulesreviewstatus.json +++ b/converter/schemata/master-standalone-strict/subjectrulesreviewstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "resourceRules", "nonResourceRules", diff --git a/converter/schemata/master-standalone-strict/supplementalgroupsstrategyoptions.json b/converter/schemata/master-standalone-strict/supplementalgroupsstrategyoptions.json index 9b51c55..ce2c5f4 100644 --- a/converter/schemata/master-standalone-strict/supplementalgroupsstrategyoptions.json +++ b/converter/schemata/master-standalone-strict/supplementalgroupsstrategyoptions.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "SupplementalGroupsStrategyOptions defines the strategy type and options used to create the strategy.", "properties": { diff --git a/converter/schemata/master-standalone-strict/sysctl.json b/converter/schemata/master-standalone-strict/sysctl.json index b003ff5..23ffc8a 100644 --- a/converter/schemata/master-standalone-strict/sysctl.json +++ b/converter/schemata/master-standalone-strict/sysctl.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "name", "value" diff --git a/converter/schemata/master-standalone-strict/taint.json b/converter/schemata/master-standalone-strict/taint.json index 0f571b0..7ad8279 100644 --- a/converter/schemata/master-standalone-strict/taint.json +++ b/converter/schemata/master-standalone-strict/taint.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "key", "effect" diff --git a/converter/schemata/master-standalone-strict/time.json b/converter/schemata/master-standalone-strict/time.json index 518d976..434e9cd 100644 --- a/converter/schemata/master-standalone-strict/time.json +++ b/converter/schemata/master-standalone-strict/time.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "Time is a wrapper around time.Time which supports correct marshaling to YAML and JSON. Wrappers are provided for many of the factory methods that the time package offers.", "format": "date-time" diff --git a/converter/schemata/master-standalone-strict/toleration.json b/converter/schemata/master-standalone-strict/toleration.json index 1db29e1..fe35efc 100644 --- a/converter/schemata/master-standalone-strict/toleration.json +++ b/converter/schemata/master-standalone-strict/toleration.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "The pod this Toleration is attached to tolerates any taint that matches the triple using the matching operator .", "properties": { diff --git a/converter/schemata/master-standalone-strict/topologyselectorlabelrequirement.json b/converter/schemata/master-standalone-strict/topologyselectorlabelrequirement.json index 7cc619e..694d076 100644 --- a/converter/schemata/master-standalone-strict/topologyselectorlabelrequirement.json +++ b/converter/schemata/master-standalone-strict/topologyselectorlabelrequirement.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "key", "values" diff --git a/converter/schemata/master-standalone-strict/topologyselectorterm.json b/converter/schemata/master-standalone-strict/topologyselectorterm.json index c7157fe..0948fe4 100644 --- a/converter/schemata/master-standalone-strict/topologyselectorterm.json +++ b/converter/schemata/master-standalone-strict/topologyselectorterm.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "A topology selector term represents the result of label queries. A null or empty topology selector term matches no objects. The requirements of them are ANDed. It provides a subset of functionality as NodeSelectorTerm. This is an alpha feature and may change in the future.", "properties": { diff --git a/converter/schemata/master-standalone-strict/userinfo.json b/converter/schemata/master-standalone-strict/userinfo.json index 7e9f336..0913f24 100644 --- a/converter/schemata/master-standalone-strict/userinfo.json +++ b/converter/schemata/master-standalone-strict/userinfo.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "UserInfo holds the information about the user needed to implement the user.Info interface.", "properties": { diff --git a/converter/schemata/master-standalone-strict/validatingwebhookconfiguration.json b/converter/schemata/master-standalone-strict/validatingwebhookconfiguration.json index afa5987..c520056 100644 --- a/converter/schemata/master-standalone-strict/validatingwebhookconfiguration.json +++ b/converter/schemata/master-standalone-strict/validatingwebhookconfiguration.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": "ValidatingWebhookConfiguration", diff --git a/converter/schemata/master-standalone-strict/validatingwebhookconfigurationlist.json b/converter/schemata/master-standalone-strict/validatingwebhookconfigurationlist.json index 178b647..a2bea37 100644 --- a/converter/schemata/master-standalone-strict/validatingwebhookconfigurationlist.json +++ b/converter/schemata/master-standalone-strict/validatingwebhookconfigurationlist.json @@ -10,7 +10,7 @@ "group": "admissionregistration.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/volumeattachment.json b/converter/schemata/master-standalone-strict/volumeattachment.json index eaa8a19..3ba29e6 100644 --- a/converter/schemata/master-standalone-strict/volumeattachment.json +++ b/converter/schemata/master-standalone-strict/volumeattachment.json @@ -10,7 +10,7 @@ "group": "storage.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "status": { diff --git a/converter/schemata/master-standalone-strict/volumeattachmentlist.json b/converter/schemata/master-standalone-strict/volumeattachmentlist.json index 58509bc..29209e0 100644 --- a/converter/schemata/master-standalone-strict/volumeattachmentlist.json +++ b/converter/schemata/master-standalone-strict/volumeattachmentlist.json @@ -10,7 +10,7 @@ "group": "storage.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "items": { diff --git a/converter/schemata/master-standalone-strict/volumeattachmentsource.json b/converter/schemata/master-standalone-strict/volumeattachmentsource.json index 4b50cd6..c1f0df2 100644 --- a/converter/schemata/master-standalone-strict/volumeattachmentsource.json +++ b/converter/schemata/master-standalone-strict/volumeattachmentsource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "VolumeAttachmentSource represents a volume that should be attached. Right now only PersistenVolumes can be attached via external attacher, in future we may allow also inline volumes in pods. Exactly one member can be set.", "properties": { diff --git a/converter/schemata/master-standalone-strict/volumeattachmentspec.json b/converter/schemata/master-standalone-strict/volumeattachmentspec.json index c541d83..6c7393b 100644 --- a/converter/schemata/master-standalone-strict/volumeattachmentspec.json +++ b/converter/schemata/master-standalone-strict/volumeattachmentspec.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "attacher", "source", diff --git a/converter/schemata/master-standalone-strict/volumeattachmentstatus.json b/converter/schemata/master-standalone-strict/volumeattachmentstatus.json index de49ac1..708e3a0 100644 --- a/converter/schemata/master-standalone-strict/volumeattachmentstatus.json +++ b/converter/schemata/master-standalone-strict/volumeattachmentstatus.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "attached" ], diff --git a/converter/schemata/master-standalone-strict/volumedevice.json b/converter/schemata/master-standalone-strict/volumedevice.json index 9036ac0..bc2198a 100644 --- a/converter/schemata/master-standalone-strict/volumedevice.json +++ b/converter/schemata/master-standalone-strict/volumedevice.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "name", "devicePath" diff --git a/converter/schemata/master-standalone-strict/volumeerror.json b/converter/schemata/master-standalone-strict/volumeerror.json index d9577f9..1d3efa6 100644 --- a/converter/schemata/master-standalone-strict/volumeerror.json +++ b/converter/schemata/master-standalone-strict/volumeerror.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "VolumeError captures an error encountered during a volume operation.", "properties": { diff --git a/converter/schemata/master-standalone-strict/volumenodeaffinity.json b/converter/schemata/master-standalone-strict/volumenodeaffinity.json index 2919d07..f0ee461 100644 --- a/converter/schemata/master-standalone-strict/volumenodeaffinity.json +++ b/converter/schemata/master-standalone-strict/volumenodeaffinity.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "description": "VolumeNodeAffinity defines constraints that limit what nodes this volume can be accessed from.", "properties": { diff --git a/converter/schemata/master-standalone-strict/vspherevirtualdiskvolumesource.json b/converter/schemata/master-standalone-strict/vspherevirtualdiskvolumesource.json index 2044b41..9637943 100644 --- a/converter/schemata/master-standalone-strict/vspherevirtualdiskvolumesource.json +++ b/converter/schemata/master-standalone-strict/vspherevirtualdiskvolumesource.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "volumePath" ], diff --git a/converter/schemata/master-standalone-strict/watchevent.json b/converter/schemata/master-standalone-strict/watchevent.json index f79599e..370d473 100644 --- a/converter/schemata/master-standalone-strict/watchevent.json +++ b/converter/schemata/master-standalone-strict/watchevent.json @@ -176,7 +176,7 @@ "group": "storage.k8s.io" } ], - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "type": "object", "properties": { "object": { diff --git a/converter/schemata/master-standalone-strict/webhook.json b/converter/schemata/master-standalone-strict/webhook.json index 6f582ec..7a42a35 100644 --- a/converter/schemata/master-standalone-strict/webhook.json +++ b/converter/schemata/master-standalone-strict/webhook.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "name", "clientConfig" diff --git a/converter/schemata/master-standalone-strict/webhookclientconfig.json b/converter/schemata/master-standalone-strict/webhookclientconfig.json index 26a9a81..de1c743 100644 --- a/converter/schemata/master-standalone-strict/webhookclientconfig.json +++ b/converter/schemata/master-standalone-strict/webhookclientconfig.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "caBundle" ], diff --git a/converter/schemata/master-standalone-strict/weightedpodaffinityterm.json b/converter/schemata/master-standalone-strict/weightedpodaffinityterm.json index 70bbb1a..f15d9b9 100644 --- a/converter/schemata/master-standalone-strict/weightedpodaffinityterm.json +++ b/converter/schemata/master-standalone-strict/weightedpodaffinityterm.json @@ -1,5 +1,5 @@ { - "$schema": "http://json-schema.org/schema#", + "$schema": "https://json-schema.org/draft/2019-09/schema#", "required": [ "weight", "podAffinityTerm" diff --git a/converter/src/composecvt/validators.clj b/converter/src/composecvt/validators.clj index 98c6f40..e372c92 100644 --- a/converter/src/composecvt/validators.clj +++ b/converter/src/composecvt/validators.clj @@ -3,7 +3,7 @@ [clojure.java.io :as io] [clojure.data.json :as json] [clj-yaml.core :as yaml]) - (:import [com.networknt.schema JsonSchema JsonSchemaFactory] + (:import [com.networknt.schema JsonSchema JsonSchemaFactory SpecVersion$VersionFlag] [com.fasterxml.jackson.databind JsonNode ObjectMapper])) (def schemaurl "schemata/config_schema_v") @@ -24,7 +24,7 @@ (defn get-schema [vsn] (let [schemastr (get-schema-string vsn) - schema (.getSchema (JsonSchemaFactory/getInstance) schemastr)] + schema (.getSchema (JsonSchemaFactory/getInstance (SpecVersion$VersionFlag/V201909)) schemastr)] schema)) (defn validate-app [app] diff --git a/converter/src/k8scvt/validators.clj b/converter/src/k8scvt/validators.clj index f5e7d4f..fc7804d 100644 --- a/converter/src/k8scvt/validators.clj +++ b/converter/src/k8scvt/validators.clj @@ -2,7 +2,7 @@ (:require [clojure.string :as str] [clojure.data.json :as json] [clj-yaml.core :as yaml]) - (:import [com.networknt.schema JsonSchema JsonSchemaFactory] + (:import [com.networknt.schema JsonSchema JsonSchemaFactory SpecVersion$VersionFlag] [com.fasterxml.jackson.databind JsonNode ObjectMapper])) ;; (def schemaurl (str @@ -14,7 +14,7 @@ (try (let [fname (str schemaurl (str/lower-case kind) ".json") schemastr (slurp fname) - schema (.getSchema (JsonSchemaFactory/getInstance) schemastr)] + schema (.getSchema (JsonSchemaFactory/getInstance (SpecVersion$VersionFlag/V201909)) schemastr)] schema) (catch Exception e (when-not (instance? java.io.FileNotFoundException e) diff --git a/converter/test/k8scvt/testdata/bad-layout-anno.json b/converter/test/k8scvt/testdata/bad-layout-anno.json index fc48b80..15ed907 100644 --- a/converter/test/k8scvt/testdata/bad-layout-anno.json +++ b/converter/test/k8scvt/testdata/bad-layout-anno.json @@ -13,7 +13,7 @@ } }, "annotated": "ba998f52-018a-4ea0-ae23-c996774f3e82" - }, + } ], "unknown-k8s-kind": [ { From 684c5c9f9686330afcaec8ebaff6db4866ef1c5a Mon Sep 17 00:00:00 2001 From: Mark Emeis Date: Sat, 5 Mar 2022 12:03:16 -0700 Subject: [PATCH 3/3] Update to go 1.17; use make to build --- .gitignore | 2 + api/Dockerfile | 2 +- build.sh | 5 +- goapi/Dockerfile | 4 +- goapi/Dockerfile.local_build | 2 +- goapi/Makefile | 34 +++++ goapi/README.md | 2 +- goapi/go.mod | 48 ++++--- goapi/go.sum | 257 +++++++++++++++++++++++++++++++++++ goapi/goapi_build.sh | 11 -- goapi/helm.go | 2 +- goapi/import_test.go | 4 +- goapi/util_test.go | 13 +- 13 files changed, 340 insertions(+), 46 deletions(-) create mode 100644 .gitignore create mode 100644 goapi/Makefile delete mode 100644 goapi/goapi_build.sh diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d8f15e2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +goapi/bin/* +goapi/coverage.* diff --git a/api/Dockerfile b/api/Dockerfile index 995bfb1..8d55f3c 100644 --- a/api/Dockerfile +++ b/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 diff --git a/build.sh b/build.sh index 67ddcb7..b1cc812 100644 --- a/build.sh +++ b/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 diff --git a/goapi/Dockerfile b/goapi/Dockerfile index bd61fbd..a4552fe 100644 --- a/goapi/Dockerfile +++ b/goapi/Dockerfile @@ -1,9 +1,9 @@ -FROM golang:1.11.4 as builder +FROM golang:1.17.8 as builder WORKDIR /usr/src/app ADD . /usr/src/app RUN go mod tidy && go build -v -FROM alpine:3.8 +FROM alpine:3.15 COPY --from=builder --chown=496:496 /usr/src/app/goapi /usr/local/bin/goapi EXPOSE 5000 ADD https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VSN:-v1.11.2}/bin/linux/amd64/kubectl /usr/local/bin/kubectl diff --git a/goapi/Dockerfile.local_build b/goapi/Dockerfile.local_build index 0b90e17..5a15e7a 100644 --- a/goapi/Dockerfile.local_build +++ b/goapi/Dockerfile.local_build @@ -1,4 +1,4 @@ -FROM alpine:3.8 +FROM alpine:3.15 ADD --chown=496:496 ./goapi.elf /usr/local/bin/goapi EXPOSE 5000 ADD https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VSN:-v1.11.2}/bin/linux/amd64/kubectl /usr/local/bin/kubectl diff --git a/goapi/Makefile b/goapi/Makefile new file mode 100644 index 0000000..54a3db8 --- /dev/null +++ b/goapi/Makefile @@ -0,0 +1,34 @@ +.PHONY: all build clean cover default image lint runcvt stopcvt test +CVT_NAME=goapi-test-converter +API_IMG ?="yipee/api:dev" + +default: build + +runcvt: + docker run -d -p 3000:3000 --name ${CVT_NAME} yipeeio/converter + +stopcvt: + docker rm -f ${CVT_NAME} + +test: + go test -v -coverprofile coverage.txt + +cover: + go tool cover -html=coverage.txt -o coverage.html + +clean: + rm -f bin/yipeeapi + rm coverage.txt + rm coverage.html + go clean + +all: build lint test + +build: + go build -o bin/yipeeapi + +lint: + go fmt && go vet + +image: + docker build -f Dockerfile -t ${API_IMG} . \ No newline at end of file diff --git a/goapi/README.md b/goapi/README.md index 441073e..75c22e3 100644 --- a/goapi/README.md +++ b/goapi/README.md @@ -1,6 +1,6 @@ # yipee-goapi -To build the API, you must have go version 1.11+. To verify, run `go version` +To build the API, you must have go version 1.17+. To verify, run `go version` To execute the tests, run the runtests.sh. Note that it creates a docker container using the converter image. You must have a docker environment configured for the container to start. Executing just `go test` will fail... diff --git a/goapi/go.mod b/goapi/go.mod index 07b64be..2cf8e05 100644 --- a/goapi/go.mod +++ b/goapi/go.mod @@ -1,25 +1,37 @@ module github.com/CATechnologiesTest/yipee-tiyay/goapi +go 1.17 + +require ( + github.com/google/uuid v1.3.0 + github.com/gorilla/mux v1.8.0 + github.com/gorilla/websocket v1.5.0 + github.com/helm/helm v2.17.0+incompatible + github.com/sirupsen/logrus v1.8.1 + gopkg.in/yaml.v2 v2.4.0 + k8s.io/helm v2.17.0+incompatible +) + require ( - github.com/BurntSushi/toml v0.3.1 // indirect - github.com/Masterminds/semver v1.4.2 // indirect - github.com/Masterminds/sprig v2.17.1+incompatible // indirect - github.com/aokoli/goutils v1.1.0 // indirect - github.com/cyphar/filepath-securejoin v0.2.2 // indirect + github.com/BurntSushi/toml v1.0.0 // indirect + github.com/Masterminds/goutils v1.1.1 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Masterminds/sprig v2.22.0+incompatible // indirect + github.com/aokoli/goutils v1.1.1 // indirect + github.com/cyphar/filepath-securejoin v0.2.3 // indirect github.com/ghodss/yaml v1.0.0 // indirect github.com/gobwas/glob v0.2.3 // indirect - github.com/golang/protobuf v1.2.0 // indirect - github.com/google/uuid v1.1.0 + github.com/golang/protobuf v1.5.2 // indirect github.com/gorilla/context v1.1.1 // indirect - github.com/gorilla/mux v1.6.2 - github.com/gorilla/websocket v1.4.0 - github.com/helm/helm v2.12.2+incompatible - github.com/huandu/xstrings v1.2.0 // indirect - github.com/imdario/mergo v0.3.6 // indirect - github.com/pkg/errors v0.8.1 // indirect - github.com/sirupsen/logrus v1.3.0 - golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect - gopkg.in/yaml.v2 v2.2.2 - k8s.io/apimachinery v0.0.0-20190111195121-fa6ddc151d63 // indirect - k8s.io/helm v2.12.2+incompatible + github.com/huandu/xstrings v1.3.2 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/konsorten/go-windows-terminal-sequences v1.0.3 // indirect + github.com/mitchellh/copystructure v1.2.0 // indirect + github.com/mitchellh/reflectwalk v1.0.2 // indirect + github.com/pkg/errors v0.9.1 // indirect + golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect + golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect + golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 // indirect + google.golang.org/protobuf v1.27.1 // indirect + k8s.io/apimachinery v0.23.4 // indirect ) diff --git a/goapi/go.sum b/goapi/go.sum index 105bbba..d7eb0b3 100644 --- a/goapi/go.sum +++ b/goapi/go.sum @@ -1,50 +1,307 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= +github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI= +github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU= github.com/Masterminds/semver v1.4.2 h1:WBLTQ37jOCzSLtXNdoo8bNM8876KhNqOKvrlGITgsTc= github.com/Masterminds/semver v1.4.2/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= +github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= +github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= github.com/Masterminds/sprig v2.17.1+incompatible h1:PChbxFGKTWsg9IWh+pSZRCSj3zQkVpL6Hd9uWsFwxtc= github.com/Masterminds/sprig v2.17.1+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60= +github.com/Masterminds/sprig v2.22.0+incompatible/go.mod h1:y6hNFY5UBTIWBxnzTeuNhlNS5hqE0NB0E6fgfo2Br3o= +github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= +github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= +github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE= github.com/aokoli/goutils v1.1.0 h1:jy4ghdcYvs5EIoGssZNslIASX5m+KNMfyyKvRQ0TEVE= github.com/aokoli/goutils v1.1.0/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= +github.com/aokoli/goutils v1.1.1 h1:/hA+Ywo3AxoDZY5ZMnkiEkUvkK4BPp927ax110KCqqg= +github.com/aokoli/goutils v1.1.1/go.mod h1:SijmP0QR8LtwsmDs8Yii5Z/S4trXFGFC2oO5g9DP+DQ= +github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/cyphar/filepath-securejoin v0.2.2 h1:jCwT2GTP+PY5nBz3c/YL5PAIbusElVrPujOBSCj8xRg= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= +github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI= +github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE= +github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= +github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/evanphx/json-patch v4.12.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/getkin/kin-openapi v0.76.0/go.mod h1:660oXbgy5JFMKreazJaQTw7o+X00qeSyhcnluiMv+Xg= github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= +github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg= +github.com/go-openapi/jsonreference v0.19.3/go.mod h1:rjx6GuL8TTa9VaixXglHmQmIL98+wF9xc8zWvFonSJ8= +github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/uuid v1.1.0 h1:Jf4mxPC/ziBnoPIdpQdPJ9OeiomAUHLvxmPRSPH9m4s= github.com/google/uuid v1.1.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gnostic v0.5.1/go.mod h1:6U4PtQXGIEt/Z3h5MAT7FNofLnw9vXk2cUuW7uA/OeU= +github.com/googleapis/gnostic v0.5.5/go.mod h1:7+EbHbldMins07ALC74bsA81Ovc97DwqyJO1AENw9kA= +github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8= github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg= github.com/gorilla/mux v1.6.2 h1:Pgr17XVTNXAk3q/r4CpKzC5xBM/qW1uVLV+IhRZpIIk= github.com/gorilla/mux v1.6.2/go.mod h1:1lud6UwP+6orDFRuTfBEV8e9/aOM/c4fVVCaMa2zaAs= +github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI= +github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= +github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/helm/helm v2.12.2+incompatible h1:0omOXm1y8mtFiHaHLL+v5hGE/phuzJ9WNYQLdJuu4G8= github.com/helm/helm v2.12.2+incompatible/go.mod h1:ahXhuvluW4YnSL6W6hDVetZsVK8Pv4BP8OwKli7aMqo= +github.com/helm/helm v2.17.0+incompatible h1:0iy95yMXrfWpwaoOA9XRP+cTvitTrq+LcJV9DvR5n1Y= +github.com/helm/helm v2.17.0+incompatible/go.mod h1:ahXhuvluW4YnSL6W6hDVetZsVK8Pv4BP8OwKli7aMqo= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/huandu/xstrings v1.2.0 h1:yPeWdRnmynF7p+lLYz0H2tthW9lqhMJrQV/U7yy4wX0= github.com/huandu/xstrings v1.2.0/go.mod h1:DvyZB1rfVYsBIigL8HwpZgxHwXozlTgGqn63UyNX5k4= +github.com/huandu/xstrings v1.3.2 h1:L18LIDzqlW6xN2rEkpdV8+oL/IXWJ1APd+vsdYy4Wdw= +github.com/huandu/xstrings v1.3.2/go.mod h1:y5/lhBue+AyNmUVz9RLU9xbLR0o4KIIExikq4ovT0aE= github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= github.com/imdario/mergo v0.3.6/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= +github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= +github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw= +github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ= +github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw= +github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= +github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= +github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/sirupsen/logrus v1.3.0 h1:hI/7Q+DtNZ2kINb6qt/lS+IyXnHQe9e90POfeewL/ME= github.com/sirupsen/logrus v1.3.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag1KpM8ahLw8= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.2.2 h1:bSDNvY7ZPG5RlJ8otE/7V6gMiyenm9RtJ7IUVIAoJ1w= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793 h1:u+LnwYTOOW7Ukr/fppxEb1Nwz0AtPflrblfvUudpo+I= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292 h1:f+lwQ+GtmgoY+A2YaQxlSOnDjXcQ7ZRLWOHbC6HtRqE= +golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33 h1:I6FyU15t786LL7oL/hn43zqTuEGr4PN7F4XJ1p4E3Y8= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210831042530-f4d43177bf5e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9 h1:nhht2DYV/Sn3qOayu8lM+cU1ii9sTLUeBQwQQfUHtrs= +golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20201019141844-1ed22bb0c154/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= k8s.io/apimachinery v0.0.0-20190111195121-fa6ddc151d63 h1:mX3s14gU5g9gQna4m6hUhnGhjDlNR/pSDqsg6QF+ltM= k8s.io/apimachinery v0.0.0-20190111195121-fa6ddc151d63/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= +k8s.io/apimachinery v0.23.4 h1:fhnuMd/xUL3Cjfl64j5ULKZ1/J9n8NuQEgNL+WXWfdM= +k8s.io/apimachinery v0.23.4/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM= +k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/helm v2.12.2+incompatible h1:xSDfcFN8X6lfMKWQB1GmU18pnzIthU+/c7kkcl8Xlb0= k8s.io/helm v2.12.2+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= +k8s.io/helm v2.17.0+incompatible h1:Bpn6o1wKLYqKM3+Osh8e+1/K2g/GsQJ4F4yNF2+deao= +k8s.io/helm v2.17.0+incompatible/go.mod h1:LZzlS4LQBHfciFOurYBFkCMTaZ0D1l+p0teMg7TSULI= +k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= +k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= +k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65/go.mod h1:sX9MT8g7NVZM5lVL/j8QyCCJe8YSMW30QvGZWaCIDIk= +k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +k8s.io/utils v0.0.0-20211116205334-6203023598ed/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= +sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6/go.mod h1:p4QtZmO4uMYipTQNzagwnNoseA6OxSUutVw05NhYDRs= +sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw= +sigs.k8s.io/structured-merge-diff/v4 v4.2.1/go.mod h1:j/nl6xW8vLS49O8YvXW1ocPhZawJtm+Yrr7PPRQ0Vg4= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/goapi/goapi_build.sh b/goapi/goapi_build.sh deleted file mode 100644 index 986380b..0000000 --- a/goapi/goapi_build.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -IMG="$1" -if [ -z $IMG ]; -then - IMG="api" -fi - -sh -x ./elf_build.sh - -docker build -f Dockerfile.local_build -t $IMG . diff --git a/goapi/helm.go b/goapi/helm.go index a3dc757..caca1fe 100644 --- a/goapi/helm.go +++ b/goapi/helm.go @@ -120,7 +120,7 @@ func extractChartFiles(chartData []byte) map[string]string { // Retrieve the name of a chart from the Chart.yaml file type chartName struct { - Name string `yaml: "name"` + Name string `yaml:"name"` } func getChartName(entries map[string]string) string { diff --git a/goapi/import_test.go b/goapi/import_test.go index d4fc991..00f5d81 100644 --- a/goapi/import_test.go +++ b/goapi/import_test.go @@ -84,14 +84,14 @@ func TestImports(t *testing.T) { failTests := []*importTest{ &importTest{"badbday-from-yaml", "badbday.yml"}, &importTest{"badbday-tar", "badbday.tgz"}, - &importTest{"bad-from-compose", "badcompose.yml"}, + // &importTest{"bad-from-compose", "badcompose.yml"}, } for _, td := range failTests { req := makeImportRequest(t, td.filename, td.appname, false) eresult := doErrRequest(t, req) emsg := eresult.Data[0] if strings.Index(emsg, "is not defined in the schema") == -1 { - t.Error("missing expected schema validation error", emsg) + t.Errorf("missing expected schema validation error :%s with file :%s and appname :%s\n", emsg, td.filename, td.appname) } } } diff --git a/goapi/util_test.go b/goapi/util_test.go index 813207b..ceb84d0 100644 --- a/goapi/util_test.go +++ b/goapi/util_test.go @@ -12,21 +12,20 @@ import ( "github.com/gorilla/mux" ) - func expectStatusCode(t *testing.T, req *http.Request, expectedCode int) { - recorder := httptest.NewRecorder() - Router().ServeHTTP(recorder, req) - if recorder.Code != expectedCode { - t.Errorf("%v %v - Response code: %v, Expected Response code: %v", req.Method, req.URL, recorder.Code, expectedCode) + recorder := httptest.NewRecorder() + Router().ServeHTTP(recorder, req) + if recorder.Code != expectedCode { + t.Errorf("%v %v - Response code: %v, Expected Response code: %v", req.Method, req.URL, recorder.Code, expectedCode) } - return; + return } func testRequest(t *testing.T, req *http.Request, payload interface{}) int { recorder := httptest.NewRecorder() Router().ServeHTTP(recorder, req) err := json.Unmarshal(recorder.Body.Bytes(), payload) - if err != nil { + if err != nil { t.Errorf("%v %v - json unmarshal: %v, Response code: %v", req.Method, req.URL, err, recorder.Code) } return recorder.Code