From 32619ff0cd8a05e82899065290e4c0b41a1083f8 Mon Sep 17 00:00:00 2001 From: fabric8-release Date: Fri, 29 Jun 2018 09:19:48 +0000 Subject: [PATCH] release 3.0.0 --- kubernetes-model-annotator/pom.xml | 2 +- kubernetes-model/pom.xml | 2 +- .../resources/schema/validation-schema.json | 153 ++++++++++++------ model-generator-app/pom.xml | 2 +- pom.xml | 2 +- 5 files changed, 110 insertions(+), 51 deletions(-) diff --git a/kubernetes-model-annotator/pom.xml b/kubernetes-model-annotator/pom.xml index 0484af49a..292080bc0 100644 --- a/kubernetes-model-annotator/pom.xml +++ b/kubernetes-model-annotator/pom.xml @@ -21,7 +21,7 @@ io.fabric8 kubernetes-model-generator - 3.0-SNAPSHOT + 3.0.0 4.0.0 diff --git a/kubernetes-model/pom.xml b/kubernetes-model/pom.xml index dc88d2bba..282f9d2c5 100644 --- a/kubernetes-model/pom.xml +++ b/kubernetes-model/pom.xml @@ -22,7 +22,7 @@ io.fabric8 kubernetes-model-generator - 3.0-SNAPSHOT + 3.0.0 kubernetes-model diff --git a/kubernetes-model/src/main/resources/schema/validation-schema.json b/kubernetes-model/src/main/resources/schema/validation-schema.json index 2233922c6..8949ab552 100644 --- a/kubernetes-model/src/main/resources/schema/validation-schema.json +++ b/kubernetes-model/src/main/resources/schema/validation-schema.json @@ -19288,9 +19288,44 @@ }, "deploymentstrategy": { "properties": { - "rollingUpdate": { - "$ref": "#/definitions/kubernetes_apps_RollingUpdateDeployment", - "javaType": "io.fabric8.kubernetes.api.model.apps.RollingUpdateDeployment" + "activeDeadlineSeconds": { + "type": "integer", + "description": "", + "javaType": "Long" + }, + "annotations": { + "type": "object", + "description": "", + "additionalProperties": { + "type": "string", + "description": "" + }, + "javaType": "java.util.Map\u003cString,String\u003e" + }, + "customParams": { + "$ref": "#/definitions/os_deploy_CustomDeploymentStrategyParams", + "javaType": "io.fabric8.openshift.api.model.CustomDeploymentStrategyParams" + }, + "labels": { + "type": "object", + "description": "", + "additionalProperties": { + "type": "string", + "description": "" + }, + "javaType": "java.util.Map\u003cString,String\u003e" + }, + "recreateParams": { + "$ref": "#/definitions/os_deploy_RecreateDeploymentStrategyParams", + "javaType": "io.fabric8.openshift.api.model.RecreateDeploymentStrategyParams" + }, + "resources": { + "$ref": "#/definitions/kubernetes_core_ResourceRequirements", + "javaType": "io.fabric8.kubernetes.api.model.ResourceRequirements" + }, + "rollingParams": { + "$ref": "#/definitions/os_deploy_RollingDeploymentStrategyParams", + "javaType": "io.fabric8.openshift.api.model.RollingDeploymentStrategyParams" }, "type": { "type": "string", @@ -21991,10 +22026,6 @@ }, "listmeta": { "properties": { - "continue": { - "type": "string", - "description": "" - }, "resourceVersion": { "type": "string", "description": "" @@ -22047,26 +22078,70 @@ "apiVersion": { "type": "string", "description": "", - "default": "authorization.k8s.io/v1", + "default": "authorization.openshift.io/v1", "required": true }, + "content": { + "$ref": "#/definitions/kubernetes_apimachinery_pkg_runtime_RawExtension", + "javaType": "io.fabric8.kubernetes.api.model.HasMetadata" + }, + "groups": { + "type": "array", + "description": "", + "items": { + "type": "string", + "description": "" + } + }, + "isNonResourceURL": { + "type": "boolean", + "description": "" + }, "kind": { "type": "string", "description": "", "default": "LocalSubjectAccessReview", "required": true }, - "metadata": { - "$ref": "#/definitions/kubernetes_apimachinery_ObjectMeta", - "javaType": "io.fabric8.kubernetes.api.model.ObjectMeta" + "namespace": { + "type": "string", + "description": "" }, - "spec": { - "$ref": "#/definitions/kubernetes_authorization_SubjectAccessReviewSpec", - "javaType": "io.fabric8.kubernetes.api.model.authorization.SubjectAccessReviewSpec" + "path": { + "type": "string", + "description": "" }, - "status": { - "$ref": "#/definitions/kubernetes_authorization_SubjectAccessReviewStatus", - "javaType": "io.fabric8.kubernetes.api.model.authorization.SubjectAccessReviewStatus" + "resource": { + "type": "string", + "description": "" + }, + "resourceAPIGroup": { + "type": "string", + "description": "" + }, + "resourceAPIVersion": { + "type": "string", + "description": "" + }, + "resourceName": { + "type": "string", + "description": "" + }, + "scopes": { + "type": "array", + "description": "", + "items": { + "type": "string", + "description": "" + } + }, + "user": { + "type": "string", + "description": "" + }, + "verb": { + "type": "string", + "description": "" } }, "additionalProperties": true @@ -25769,7 +25844,7 @@ "apiVersion": { "type": "string", "description": "", - "default": "authorization.openshift.io/v1", + "default": "rbac.authorization.k8s.io/v1", "required": true }, "kind": { @@ -25786,8 +25861,8 @@ "type": "array", "description": "", "items": { - "$ref": "#/definitions/os_authorization_PolicyRule", - "javaType": "io.fabric8.openshift.api.model.PolicyRule" + "$ref": "#/definitions/kubernetes_rbac_PolicyRule", + "javaType": "io.fabric8.kubernetes.api.model.rbac.KubernetesPolicyRule" } } }, @@ -25798,17 +25873,9 @@ "apiVersion": { "type": "string", "description": "", - "default": "authorization.openshift.io/v1", + "default": "rbac.authorization.k8s.io/v1", "required": true }, - "groupNames": { - "type": "array", - "description": "", - "items": { - "type": "string", - "description": "" - } - }, "kind": { "type": "string", "description": "", @@ -25820,23 +25887,15 @@ "javaType": "io.fabric8.kubernetes.api.model.ObjectMeta" }, "roleRef": { - "$ref": "#/definitions/kubernetes_core_ObjectReference", - "javaType": "io.fabric8.kubernetes.api.model.ObjectReference" + "$ref": "#/definitions/kubernetes_rbac_RoleRef", + "javaType": "io.fabric8.kubernetes.api.model.rbac.KubernetesRoleRef" }, "subjects": { "type": "array", "description": "", "items": { - "$ref": "#/definitions/kubernetes_core_ObjectReference", - "javaType": "io.fabric8.kubernetes.api.model.ObjectReference" - } - }, - "userNames": { - "type": "array", - "description": "", - "items": { - "type": "string", - "description": "" + "$ref": "#/definitions/kubernetes_rbac_Subject", + "javaType": "io.fabric8.kubernetes.api.model.rbac.KubernetesSubject" } } }, @@ -25847,15 +25906,15 @@ "apiVersion": { "type": "string", "description": "", - "default": "rbac.authorization.k8s.io/v1", + "default": "authorization.openshift.io/v1", "required": true }, "items": { "type": "array", "description": "", "items": { - "$ref": "#/definitions/kubernetes_rbac_RoleBinding", - "javaType": "io.fabric8.kubernetes.api.model.rbac.KubernetesRoleBinding" + "$ref": "#/definitions/os_authorization_RoleBinding", + "javaType": "io.fabric8.openshift.api.model.RoleBinding" } }, "kind": { @@ -25918,15 +25977,15 @@ "apiVersion": { "type": "string", "description": "", - "default": "authorization.openshift.io/v1", + "default": "rbac.authorization.k8s.io/v1", "required": true }, "items": { "type": "array", "description": "", "items": { - "$ref": "#/definitions/os_authorization_Role", - "javaType": "io.fabric8.openshift.api.model.Role" + "$ref": "#/definitions/kubernetes_rbac_Role", + "javaType": "io.fabric8.kubernetes.api.model.rbac.KubernetesRole" } }, "kind": { diff --git a/model-generator-app/pom.xml b/model-generator-app/pom.xml index ec1553e29..d068a2554 100644 --- a/model-generator-app/pom.xml +++ b/model-generator-app/pom.xml @@ -22,7 +22,7 @@ io.fabric8 kubernetes-model-generator - 3.0-SNAPSHOT + 3.0.0 model-generator-app diff --git a/pom.xml b/pom.xml index b20b4c818..cad96da5a 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ io.fabric8 - 3.0-SNAPSHOT + 3.0.0 kubernetes-model-generator pom