This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/master by this push:
new 5ba6508 Get rid of json schema generation #1037
new 3a45fe1 Merge pull request #1278 from lburgazzoli/github-1037
5ba6508 is described below
commit 5ba6508d49c6adec5f02679ecc24ed41933b2f06
Author: lburgazzoli <lburgazz...@gmail.com>
AuthorDate: Sat Feb 15 10:45:27 2020 +0100
Get rid of json schema generation #1037
---
assets/json-schema/CamelCatalog.json | 375 -----------------------
assets/json-schema/Integration.json | 443 ----------------------------
assets/json-schema/IntegrationKit.json | 364 -----------------------
assets/json-schema/IntegrationPlatform.json | 337 ---------------------
cmd/util/json-schema-gen/jsonschemagen.go | 85 ------
script/Makefile | 9 +-
6 files changed, 3 insertions(+), 1610 deletions(-)
diff --git a/assets/json-schema/CamelCatalog.json
b/assets/json-schema/CamelCatalog.json
deleted file mode 100644
index 44cb037..0000000
--- a/assets/json-schema/CamelCatalog.json
+++ /dev/null
@@ -1,375 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/CamelCatalog",
- "definitions": {
- "CamelArtifact": {
- "required": [
- "groupId",
- "artifactId"
- ],
- "properties": {
- "artifactId": {
- "type": "string"
- },
- "dataformats": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "dependencies": {
- "items": {
- "$ref": "#/definitions/CamelArtifact"
- },
- "type": "array"
- },
- "exclusions": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/CamelArtifactExclusion"
- },
- "type": "array"
- },
- "groupId": {
- "type": "string"
- },
- "javaTypes": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "languages": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "schemes": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/CamelScheme"
- },
- "type": "array"
- },
- "version": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "CamelArtifactExclusion": {
- "required": [
- "groupId",
- "artifactId"
- ],
- "properties": {
- "artifactId": {
- "type": "string"
- },
- "groupId": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "CamelCatalog": {
- "properties": {
- "annotations": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "apiVersion": {
- "type": "string"
- },
- "clusterName": {
- "type": "string"
- },
- "creationTimestamp": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Time"
- },
- "deletionGracePeriodSeconds": {
- "type": "integer"
- },
- "deletionTimestamp": {
- "$ref": "#/definitions/Time"
- },
- "finalizers": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "generateName": {
- "type": "string"
- },
- "generation": {
- "type": "integer"
- },
- "kind": {
- "type": "string"
- },
- "labels": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "managedFields": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/ManagedFieldsEntry"
- },
- "type": "array"
- },
- "name": {
- "type": "string"
- },
- "namespace": {
- "type": "string"
- },
- "ownerReferences": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/OwnerReference"
- },
- "type": "array"
- },
- "resourceVersion": {
- "type": "string"
- },
- "selfLink": {
- "type": "string"
- },
- "spec": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/CamelCatalogSpec"
- },
- "status": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/CamelCatalogStatus"
- },
- "uid": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "CamelCatalogSpec": {
- "required": [
- "runtime",
- "artifacts",
- "loaders"
- ],
- "properties": {
- "artifacts": {
- "patternProperties": {
- ".*": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/CamelArtifact"
- }
- },
- "type": "object"
- },
- "loaders": {
- "patternProperties": {
- ".*": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/CamelLoader"
- }
- },
- "type": "object"
- },
- "runtime": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/RuntimeSpec"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "CamelCatalogStatus": {
- "additionalProperties": false,
- "type": "object"
- },
- "CamelLoader": {
- "required": [
- "groupId",
- "artifactId"
- ],
- "properties": {
- "artifactId": {
- "type": "string"
- },
- "dependencies": {
- "items": {
- "$ref": "#/definitions/MavenArtifact"
- },
- "type": "array"
- },
- "groupId": {
- "type": "string"
- },
- "languages": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "version": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "CamelScheme": {
- "required": [
- "id",
- "passive",
- "http"
- ],
- "properties": {
- "http": {
- "type": "boolean"
- },
- "id": {
- "type": "string"
- },
- "passive": {
- "type": "boolean"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "FieldsV1": {
- "additionalProperties": false,
- "type": "object"
- },
- "ManagedFieldsEntry": {
- "properties": {
- "apiVersion": {
- "type": "string"
- },
- "fieldsType": {
- "type": "string"
- },
- "fieldsV1": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/FieldsV1"
- },
- "manager": {
- "type": "string"
- },
- "operation": {
- "type": "string"
- },
- "time": {
- "$ref": "#/definitions/Time"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "MavenArtifact": {
- "required": [
- "groupId",
- "artifactId"
- ],
- "properties": {
- "artifactId": {
- "type": "string"
- },
- "groupId": {
- "type": "string"
- },
- "version": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "OwnerReference": {
- "required": [
- "apiVersion",
- "kind",
- "name",
- "uid"
- ],
- "properties": {
- "apiVersion": {
- "type": "string"
- },
- "blockOwnerDeletion": {
- "type": "boolean"
- },
- "controller": {
- "type": "boolean"
- },
- "kind": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "uid": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "RuntimeSpec": {
- "required": [
- "version",
- "provider",
- "applicationClass",
- "dependencies"
- ],
- "properties": {
- "applicationClass": {
- "type": "string"
- },
- "dependencies": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/MavenArtifact"
- },
- "type": "array"
- },
- "metadata": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "provider": {
- "type": "string"
- },
- "version": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "Time": {
- "additionalProperties": false,
- "type": "object"
- }
- }
-}
\ No newline at end of file
diff --git a/assets/json-schema/Integration.json
b/assets/json-schema/Integration.json
deleted file mode 100644
index 71af257..0000000
--- a/assets/json-schema/Integration.json
+++ /dev/null
@@ -1,443 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Integration",
- "definitions": {
- "ConfigurationSpec": {
- "required": [
- "type",
- "value"
- ],
- "properties": {
- "type": {
- "type": "string"
- },
- "value": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "Failure": {
- "required": [
- "reason",
- "time",
- "recovery"
- ],
- "properties": {
- "reason": {
- "type": "string"
- },
- "recovery": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/FailureRecovery"
- },
- "time": {
- "$ref": "#/definitions/Time"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "FailureRecovery": {
- "required": [
- "attempt",
- "attemptMax",
- "attemptTime"
- ],
- "properties": {
- "attempt": {
- "type": "integer"
- },
- "attemptMax": {
- "type": "integer"
- },
- "attemptTime": {
- "$ref": "#/definitions/Time"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "FieldsV1": {
- "additionalProperties": false,
- "type": "object"
- },
- "Integration": {
- "properties": {
- "annotations": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "apiVersion": {
- "type": "string"
- },
- "clusterName": {
- "type": "string"
- },
- "creationTimestamp": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Time"
- },
- "deletionGracePeriodSeconds": {
- "type": "integer"
- },
- "deletionTimestamp": {
- "$ref": "#/definitions/Time"
- },
- "finalizers": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "generateName": {
- "type": "string"
- },
- "generation": {
- "type": "integer"
- },
- "kind": {
- "type": "string"
- },
- "labels": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "managedFields": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/ManagedFieldsEntry"
- },
- "type": "array"
- },
- "name": {
- "type": "string"
- },
- "namespace": {
- "type": "string"
- },
- "ownerReferences": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/OwnerReference"
- },
- "type": "array"
- },
- "resourceVersion": {
- "type": "string"
- },
- "selfLink": {
- "type": "string"
- },
- "spec": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationSpec"
- },
- "status": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationStatus"
- },
- "uid": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationCondition": {
- "required": [
- "type",
- "status"
- ],
- "properties": {
- "lastTransitionTime": {
- "$ref": "#/definitions/Time"
- },
- "lastUpdateTime": {
- "$ref": "#/definitions/Time"
- },
- "message": {
- "type": "string"
- },
- "reason": {
- "type": "string"
- },
- "status": {
- "type": "string"
- },
- "type": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationSpec": {
- "properties": {
- "configuration": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/ConfigurationSpec"
- },
- "type": "array"
- },
- "dependencies": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "kit": {
- "type": "string"
- },
- "profile": {
- "type": "string"
- },
- "replicas": {
- "type": "integer"
- },
- "repositories": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "resources": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/ResourceSpec"
- },
- "type": "array"
- },
- "serviceAccountName": {
- "type": "string"
- },
- "sources": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/SourceSpec"
- },
- "type": "array"
- },
- "traits": {
- "patternProperties": {
- ".*": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/TraitSpec"
- }
- },
- "type": "object"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationStatus": {
- "properties": {
- "conditions": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationCondition"
- },
- "type": "array"
- },
- "configuration": {
- "items": {
- "$ref": "#/definitions/ConfigurationSpec"
- },
- "type": "array"
- },
- "dependencies": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "digest": {
- "type": "string"
- },
- "failure": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Failure"
- },
- "generatedResources": {
- "items": {
- "$ref": "#/definitions/ResourceSpec"
- },
- "type": "array"
- },
- "generatedSources": {
- "items": {
- "$ref": "#/definitions/SourceSpec"
- },
- "type": "array"
- },
- "image": {
- "type": "string"
- },
- "kit": {
- "type": "string"
- },
- "phase": {
- "type": "string"
- },
- "platform": {
- "type": "string"
- },
- "profile": {
- "type": "string"
- },
- "replicas": {
- "type": "integer"
- },
- "runtimeProvider": {
- "type": "string"
- },
- "runtimeVersion": {
- "type": "string"
- },
- "version": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "ManagedFieldsEntry": {
- "properties": {
- "apiVersion": {
- "type": "string"
- },
- "fieldsType": {
- "type": "string"
- },
- "fieldsV1": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/FieldsV1"
- },
- "manager": {
- "type": "string"
- },
- "operation": {
- "type": "string"
- },
- "time": {
- "$ref": "#/definitions/Time"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "OwnerReference": {
- "required": [
- "apiVersion",
- "kind",
- "name",
- "uid"
- ],
- "properties": {
- "apiVersion": {
- "type": "string"
- },
- "blockOwnerDeletion": {
- "type": "boolean"
- },
- "controller": {
- "type": "boolean"
- },
- "kind": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "uid": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "ResourceSpec": {
- "properties": {
- "compression": {
- "type": "boolean"
- },
- "content": {
- "type": "string"
- },
- "contentKey": {
- "type": "string"
- },
- "contentRef": {
- "type": "string"
- },
- "mountPath": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "type": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "SourceSpec": {
- "properties": {
- "compression": {
- "type": "boolean"
- },
- "content": {
- "type": "string"
- },
- "contentKey": {
- "type": "string"
- },
- "contentRef": {
- "type": "string"
- },
- "language": {
- "type": "string"
- },
- "loader": {
- "type": "string"
- },
- "name": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "Time": {
- "additionalProperties": false,
- "type": "object"
- },
- "TraitSpec": {
- "properties": {
- "configuration": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "additionalProperties": false,
- "type": "object"
- }
- }
-}
\ No newline at end of file
diff --git a/assets/json-schema/IntegrationKit.json
b/assets/json-schema/IntegrationKit.json
deleted file mode 100644
index db149f2..0000000
--- a/assets/json-schema/IntegrationKit.json
+++ /dev/null
@@ -1,364 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationKit",
- "definitions": {
- "Artifact": {
- "required": [
- "id"
- ],
- "properties": {
- "id": {
- "type": "string"
- },
- "location": {
- "type": "string"
- },
- "target": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "ConfigurationSpec": {
- "required": [
- "type",
- "value"
- ],
- "properties": {
- "type": {
- "type": "string"
- },
- "value": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "Failure": {
- "required": [
- "reason",
- "time",
- "recovery"
- ],
- "properties": {
- "reason": {
- "type": "string"
- },
- "recovery": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/FailureRecovery"
- },
- "time": {
- "$ref": "#/definitions/Time"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "FailureRecovery": {
- "required": [
- "attempt",
- "attemptMax",
- "attemptTime"
- ],
- "properties": {
- "attempt": {
- "type": "integer"
- },
- "attemptMax": {
- "type": "integer"
- },
- "attemptTime": {
- "$ref": "#/definitions/Time"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "FieldsV1": {
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationKit": {
- "properties": {
- "annotations": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "apiVersion": {
- "type": "string"
- },
- "clusterName": {
- "type": "string"
- },
- "creationTimestamp": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Time"
- },
- "deletionGracePeriodSeconds": {
- "type": "integer"
- },
- "deletionTimestamp": {
- "$ref": "#/definitions/Time"
- },
- "finalizers": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "generateName": {
- "type": "string"
- },
- "generation": {
- "type": "integer"
- },
- "kind": {
- "type": "string"
- },
- "labels": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "managedFields": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/ManagedFieldsEntry"
- },
- "type": "array"
- },
- "name": {
- "type": "string"
- },
- "namespace": {
- "type": "string"
- },
- "ownerReferences": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/OwnerReference"
- },
- "type": "array"
- },
- "resourceVersion": {
- "type": "string"
- },
- "selfLink": {
- "type": "string"
- },
- "spec": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationKitSpec"
- },
- "status": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationKitStatus"
- },
- "uid": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationKitCondition": {
- "required": [
- "type",
- "status"
- ],
- "properties": {
- "lastTransitionTime": {
- "$ref": "#/definitions/Time"
- },
- "lastUpdateTime": {
- "$ref": "#/definitions/Time"
- },
- "message": {
- "type": "string"
- },
- "reason": {
- "type": "string"
- },
- "status": {
- "type": "string"
- },
- "type": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationKitSpec": {
- "properties": {
- "configuration": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/ConfigurationSpec"
- },
- "type": "array"
- },
- "dependencies": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "image": {
- "type": "string"
- },
- "profile": {
- "type": "string"
- },
- "repositories": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "traits": {
- "patternProperties": {
- ".*": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/TraitSpec"
- }
- },
- "type": "object"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationKitStatus": {
- "properties": {
- "artifacts": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Artifact"
- },
- "type": "array"
- },
- "baseImage": {
- "type": "string"
- },
- "conditions": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationKitCondition"
- },
- "type": "array"
- },
- "digest": {
- "type": "string"
- },
- "failure": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Failure"
- },
- "image": {
- "type": "string"
- },
- "phase": {
- "type": "string"
- },
- "platform": {
- "type": "string"
- },
- "runtimeProvider": {
- "type": "string"
- },
- "runtimeVersion": {
- "type": "string"
- },
- "version": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "ManagedFieldsEntry": {
- "properties": {
- "apiVersion": {
- "type": "string"
- },
- "fieldsType": {
- "type": "string"
- },
- "fieldsV1": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/FieldsV1"
- },
- "manager": {
- "type": "string"
- },
- "operation": {
- "type": "string"
- },
- "time": {
- "$ref": "#/definitions/Time"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "OwnerReference": {
- "required": [
- "apiVersion",
- "kind",
- "name",
- "uid"
- ],
- "properties": {
- "apiVersion": {
- "type": "string"
- },
- "blockOwnerDeletion": {
- "type": "boolean"
- },
- "controller": {
- "type": "boolean"
- },
- "kind": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "uid": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "Time": {
- "additionalProperties": false,
- "type": "object"
- },
- "TraitSpec": {
- "properties": {
- "configuration": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- }
- },
- "additionalProperties": false,
- "type": "object"
- }
- }
-}
\ No newline at end of file
diff --git a/assets/json-schema/IntegrationPlatform.json
b/assets/json-schema/IntegrationPlatform.json
deleted file mode 100644
index a8b091e..0000000
--- a/assets/json-schema/IntegrationPlatform.json
+++ /dev/null
@@ -1,337 +0,0 @@
-{
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationPlatform",
- "definitions": {
- "Initializer": {
- "required": [
- "name"
- ],
- "properties": {
- "name": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "Initializers": {
- "required": [
- "pending"
- ],
- "properties": {
- "pending": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Initializer"
- },
- "type": "array"
- },
- "result": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Status"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationPlatform": {
- "properties": {
- "annotations": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "apiVersion": {
- "type": "string"
- },
- "clusterName": {
- "type": "string"
- },
- "creationTimestamp": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Time"
- },
- "deletionGracePeriodSeconds": {
- "type": "integer"
- },
- "deletionTimestamp": {
- "$ref": "#/definitions/Time"
- },
- "finalizers": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "generateName": {
- "type": "string"
- },
- "generation": {
- "type": "integer"
- },
- "initializers": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/Initializers"
- },
- "kind": {
- "type": "string"
- },
- "labels": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "name": {
- "type": "string"
- },
- "namespace": {
- "type": "string"
- },
- "ownerReferences": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/OwnerReference"
- },
- "type": "array"
- },
- "resourceVersion": {
- "type": "string"
- },
- "selfLink": {
- "type": "string"
- },
- "spec": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationPlatformSpec"
- },
- "status": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationPlatformStatus"
- },
- "uid": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationPlatformBuildSpec": {
- "properties": {
- "baseImage": {
- "type": "string"
- },
- "camelVersion": {
- "type": "string"
- },
- "localRepository": {
- "type": "string"
- },
- "properties": {
- "patternProperties": {
- ".*": {
- "type": "string"
- }
- },
- "type": "object"
- },
- "publishStrategy": {
- "type": "string"
- },
- "registry": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationPlatformRegistrySpec"
- },
- "repositories": {
- "items": {
- "type": "string"
- },
- "type": "array"
- },
- "runtimeVersion": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationPlatformRegistrySpec": {
- "properties": {
- "address": {
- "type": "string"
- },
- "insecure": {
- "type": "boolean"
- },
- "organization": {
- "type": "string"
- },
- "secret": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationPlatformResourcesSpec": {
- "properties": {
- "contexts": {
- "items": {
- "type": "string"
- },
- "type": "array"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationPlatformSpec": {
- "properties": {
- "build": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationPlatformBuildSpec"
- },
- "cluster": {
- "type": "string"
- },
- "profile": {
- "type": "string"
- },
- "resources": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/IntegrationPlatformResourcesSpec"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "IntegrationPlatformStatus": {
- "properties": {
- "phase": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "OwnerReference": {
- "required": [
- "apiVersion",
- "kind",
- "name",
- "uid"
- ],
- "properties": {
- "apiVersion": {
- "type": "string"
- },
- "blockOwnerDeletion": {
- "type": "boolean"
- },
- "controller": {
- "type": "boolean"
- },
- "kind": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "uid": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "Status": {
- "properties": {
- "apiVersion": {
- "type": "string"
- },
- "code": {
- "type": "integer"
- },
- "continue": {
- "type": "string"
- },
- "details": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/StatusDetails"
- },
- "kind": {
- "type": "string"
- },
- "message": {
- "type": "string"
- },
- "reason": {
- "type": "string"
- },
- "resourceVersion": {
- "type": "string"
- },
- "selfLink": {
- "type": "string"
- },
- "status": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "StatusCause": {
- "properties": {
- "field": {
- "type": "string"
- },
- "message": {
- "type": "string"
- },
- "reason": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "StatusDetails": {
- "properties": {
- "causes": {
- "items": {
- "$schema": "http://json-schema.org/draft-04/schema#";,
- "$ref": "#/definitions/StatusCause"
- },
- "type": "array"
- },
- "group": {
- "type": "string"
- },
- "kind": {
- "type": "string"
- },
- "name": {
- "type": "string"
- },
- "retryAfterSeconds": {
- "type": "integer"
- },
- "uid": {
- "type": "string"
- }
- },
- "additionalProperties": false,
- "type": "object"
- },
- "Time": {
- "additionalProperties": false,
- "type": "object"
- }
- }
-}
\ No newline at end of file
diff --git a/cmd/util/json-schema-gen/jsonschemagen.go
b/cmd/util/json-schema-gen/jsonschemagen.go
deleted file mode 100644
index 5732060..0000000
--- a/cmd/util/json-schema-gen/jsonschemagen.go
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
- "encoding/json"
- "fmt"
- "io/ioutil"
- "os"
- "path"
- "reflect"
-
- "github.com/alecthomas/jsonschema"
- v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
- "github.com/spf13/cobra"
-)
-
-func main() {
- sources := []interface{}{
- v1.Integration{},
- v1.IntegrationKit{},
- //v1.IntegrationPlatform{},
- v1.CamelCatalog{},
- }
-
- var out string
-
- var cmd = cobra.Command{
- Use: "jsonschemagen --out=${path}",
- Run: func(_ *cobra.Command, _ []string) {
- for _, source := range sources {
- //pin
- source := source
-
- schema := jsonschema.Reflect(source)
- b, err := json.MarshalIndent(schema, "", " ")
- if err != nil {
- fmt.Println("error:", err)
- }
-
- if _, err := os.Stat(out); err != nil {
- if os.IsNotExist(err) {
- if err := os.MkdirAll(out,
os.ModePerm); err != nil {
- fmt.Println("error:",
err)
- return
- }
- }
- }
-
- v := reflect.ValueOf(source)
- t := reflect.Indirect(v).Type().Name()
- o := path.Join(out, t+".json")
-
- fmt.Println("Write", t, "json-schema to:", o)
-
- if err := ioutil.WriteFile(o, b, 0644); err !=
nil {
- fmt.Println("error:", err)
- os.Exit(-1)
- }
- }
- },
- }
-
- cmd.Flags().StringVar(&out, "out", ".", "the path where to generate the
json schema for cr")
-
- if err := cmd.Execute(); err != nil {
- fmt.Println("error:", err)
- os.Exit(-1)
- }
-}
diff --git a/script/Makefile b/script/Makefile
index 215b2f3..4bb84b5 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -120,7 +120,7 @@ generate-doc:
generate-deepcopy:
operator-sdk generate k8s
-build: build-vfs build-kamel build-compile-integration-tests
+build: build-resources build-kamel build-compile-integration-tests
test: build
go test ./...
@@ -136,10 +136,7 @@ test-knative: build
build-kamel:
go build $(GOFLAGS) -o kamel ./cmd/kamel/*.go
-build-resources: build-vfs
- go run cmd/util/json-schema-gen/jsonschemagen.go
--out=./assets/json-schema
-
-build-vfs:
+build-resources:
./script/build_catalog.sh $(RUNTIME_VERSION)
-Dstaging.repo=$(STAGING_RUNTIME_REPO)
-Dcatalog.file=camel-catalog-$(RUNTIME_VERSION)-main.yaml
./script/build_catalog.sh $(RUNTIME_VERSION)
-Dstaging.repo=$(STAGING_RUNTIME_REPO)
-Dcatalog.file=camel-catalog-$(RUNTIME_VERSION)-quarkus.yaml
-Dcatalog.runtime=quarkus
./script/embed_resources.sh deploy
@@ -237,4 +234,4 @@ install-minikube:
release-notes:
./script/gen_release_notes.sh $(LAST_RELEASED_VERSION) $(VERSION)
-.PHONY: build build-kamel build-resources build-olm unsnapshot-olm dep codegen
images images-dev images-push images-push-staging test check test-integration
clean release cross-compile package-examples set-version git-tag release-notes
check-licenses generate-deepcopy generate-client generate-doc build-vfs
+.PHONY: build build-kamel build-resources build-olm unsnapshot-olm dep codegen
images images-dev images-push images-push-staging test check test-integration
clean release cross-compile package-examples set-version git-tag release-notes
check-licenses generate-deepcopy generate-client generate-doc build-resources
