admin/kubesphere
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
magicsong
2019-08-17 16:29:47 +08:00
parent 6ce4b54ed5 b132d7af85
commit 122fb9035d
474 changed files with 39058 additions and 6626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/api-rules/violation_exceptions.list
View File

@@ -45,3 +45,4 @@ API rule violation: names_match,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,IntVal
API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,StrVal
API rule violation: names_match,k8s.io/apimachinery/pkg/util/intstr,IntOrString,Type
API rule violation: names_match,kubesphere.io/kubesphere/pkg/apis/devops/v1alpha1,S2iBinarySpec,MD5

126
api/openapi-spec/swagger.json
View File

@@ -4469,7 +4469,7 @@
"secretRef": {
"$ref": "#/definitions/io.k8s.api.core.v1.LocalObjectReference"
},
"server_address": {
"serverAddress": {
"type": "string"
},
"username": {
@@ -4514,6 +4514,31 @@
}
}
},
"com.github.kubesphere.s2ioperator.pkg.apis.devops.v1alpha1.ContainerInfo": {
"type": "object",
"properties": {
"buildVolumes": {
"description": "BuildVolumes specifies a list of volumes to mount to container running the build.",
"type": "array",
"items": {
"type": "string"
}
},
"builderImage": {
"description": "BaseImage are the images this template will use.",
"type": "string"
},
"runtimeArtifacts": {
"type": "array",
"items": {
"$ref": "#/definitions/com.github.kubesphere.s2ioperator.pkg.apis.devops.v1alpha1.VolumeSpec"
}
},
"runtimeImage": {
"type": "string"
}
}
},
"com.github.kubesphere.s2ioperator.pkg.apis.devops.v1alpha1.DockerConfig": {
"description": "DockerConfig contains the configuration for a Docker connection.",
"type": "object",
@@ -4779,17 +4804,17 @@
"description": "S2iBuilderTemplateSpec defines the desired state of S2iBuilderTemplate",
"type": "object",
"properties": {
"baseImages": {
"description": "BaseImages are the images this template will use.",
"type": "array",
"items": {
"type": "string"
}
},
"codeFramework": {
"description": "CodeFramework means which language this template is designed for and which framework is using if has framework. Like Java, NodeJS etc",
"type": "string"
},
"containerInfo": {
"description": "Images are the images this template will use.",
"type": "array",
"items": {
"$ref": "#/definitions/com.github.kubesphere.s2ioperator.pkg.apis.devops.v1alpha1.ContainerInfo"
}
},
"defaultBaseImage": {
"description": "DefaultBaseImage is the image that will be used by default",
"type": "string"
@@ -4961,6 +4986,10 @@
"$ref": "#/definitions/com.github.kubesphere.s2ioperator.pkg.apis.devops.v1alpha1.VolumeSpec"
}
},
"isBinaryURL": {
"description": "IsBinaryURL explain the type of SourceURL. If it is IsBinaryURL, it will download the file directly without using git.",
"type": "boolean"
},
"keepSymlinks": {
"description": "KeepSymlinks indicates to copy symlinks as symlinks. Default behavior is to follow symlinks and copy files by content.",
"type": "boolean"
@@ -4980,6 +5009,17 @@
"description": "LayeredBuild describes if this is build which layered scripts and sources on top of BuilderImage.",
"type": "boolean"
},
"nodeAffinityKey": {
"description": "The key of Node Affinity.",
"type": "string"
},
"nodeAffinityValues": {
"description": "The values of Node Affinity.",
"type": "array",
"items": {
"type": "string"
}
},
"outputImageName": {
"description": "OutputImageName is a result image name without tag, default is latest. tag will append to ImageName in the end",
"type": "string"
@@ -5004,6 +5044,10 @@
"description": "RemovePreviousImage describes if previous image should be removed after successful build. This applies only to incremental builds.",
"type": "boolean"
},
"revisionId": {
"description": "The RevisionId is a branch name or a SHA-1 hash of every important thing about the commit",
"type": "string"
},
"runImage": {
"description": "RunImage will trigger a \"docker run ...\" invocation of the produced image so the user can see if it operates as he would expect",
"type": "boolean"
@@ -5050,6 +5094,10 @@
"description": "Tag is a result image tag name.",
"type": "string"
},
"taintKey": {
"description": "The name of taint.",
"type": "string"
},
"usage": {
"description": "Usage allows for properly shortcircuiting s2i logic when `s2i usage` is invoked",
"type": "boolean"
@@ -5143,6 +5191,14 @@
"description": "BuilderName specify the name of s2ibuilder, required",
"type": "string"
},
"newRevisionId": {
"description": "NewRevisionId override the default NewRevisionId in its s2ibuilder.",
"type": "string"
},
"newSourceURL": {
"description": "NewSourceURL is used to download new binary artifacts",
"type": "string"
},
"newTag": {
"description": "NewTag override the default tag in its s2ibuilder, image name cannot be changed.",
"type": "string"
@@ -5187,7 +5243,7 @@
"com.github.kubesphere.s2ioperator.pkg.apis.devops.v1alpha1.UserDefineTemplate": {
"type": "object",
"properties": {
"baseImage": {
"builderImage": {
"description": "BaseImage specify which version of this template to use",
"type": "string"
},
@@ -5207,21 +5263,16 @@
"com.github.kubesphere.s2ioperator.pkg.apis.devops.v1alpha1.VolumeSpec": {
"description": "VolumeSpec represents a single volume mount point.",
"type": "object",
"required": [
"Source",
"Destination",
"Keep"
],
"properties": {
"Destination": {
"destination": {
"description": "Destination is the path to mount the volume to - absolute or relative.",
"type": "string"
},
"Keep": {
"keep": {
"description": "Keep indicates if the mounted data should be kept in the final image.",
"type": "boolean"
},
"Source": {
"source": {
"description": "Source is a reference to the volume source.",
"type": "string"
}
@@ -5229,6 +5280,7 @@
},
"io.k8s.api.core.v1.LocalObjectReference": {
"description": "LocalObjectReference contains enough information to let you locate the referenced object inside the same namespace.",
"type": "object",
"properties": {
"name": {
"description": "Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names",
@@ -5238,6 +5290,7 @@
},
"io.k8s.api.networking.v1.IPBlock": {
"description": "IPBlock describes a particular CIDR (Ex. \"192.168.1.1/24\") that is allowed to the pods matched by a NetworkPolicySpec's podSelector. The except entry describes CIDRs that should not be included within this rule.",
"type": "object",
"required": [
"cidr"
],
@@ -5257,6 +5310,7 @@
},
"io.k8s.api.networking.v1.NetworkPolicyPort": {
"description": "NetworkPolicyPort describes a port to allow traffic on",
"type": "object",
"properties": {
"port": {
"description": "The port on the given protocol. This can either be a numerical or named port on a pod. If this field is not provided, this matches all port names and numbers.",
@@ -5270,6 +5324,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.APIGroup": {
"description": "APIGroup contains the name, the supported versions, and the preferred version of a group.",
"type": "object",
"required": [
"name",
"versions"
@@ -5316,6 +5371,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.APIGroupList": {
"description": "APIGroupList is a list of APIGroup, to allow clients to discover the API at /apis.",
"type": "object",
"required": [
"groups"
],
@@ -5346,6 +5402,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.APIResource": {
"description": "APIResource specifies the name of a resource and whether it is namespaced.",
"type": "object",
"required": [
"name",
"singularName",
@@ -5403,6 +5460,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.APIResourceList": {
"description": "APIResourceList is a list of APIResource, it is used to expose the name of the resources supported in a specific group and version, and if the resource is namespaced.",
"type": "object",
"required": [
"groupVersion",
"resources"
@@ -5438,6 +5496,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.DeleteOptions": {
"description": "DeleteOptions may be provided when deleting an API object.",
"type": "object",
"properties": {
"apiVersion": {
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
@@ -5502,6 +5561,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.GroupVersionForDiscovery": {
"description": "GroupVersion contains the \"group/version\" and \"version\" string of a version. It is made a struct to keep extensibility.",
"type": "object",
"required": [
"groupVersion",
"version"
@@ -5519,6 +5579,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.Initializer": {
"description": "Initializer is information about an initializer that has not yet completed.",
"type": "object",
"required": [
"name"
],
@@ -5531,6 +5592,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.Initializers": {
"description": "Initializers tracks the progress of initialization.",
"type": "object",
"required": [
"pending"
],
@@ -5552,6 +5614,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelector": {
"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.",
"type": "object",
"properties": {
"matchExpressions": {
"description": "matchExpressions is a list of label selector requirements. The requirements are ANDed.",
@@ -5571,6 +5634,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.LabelSelectorRequirement": {
"description": "A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values.",
"type": "object",
"required": [
"key",
"operator"
@@ -5597,6 +5661,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.ListMeta": {
"description": "ListMeta describes metadata that synthetic resources must have, including lists and various status objects. A resource may have only one of {ObjectMeta, ListMeta}.",
"type": "object",
"properties": {
"continue": {
"description": "continue may be set if the user set a limit on the number of items returned, and indicates that the server has more data available. The value is opaque and may be used to issue another request to the endpoint that served this list to retrieve the next set of available objects. Continuing a consistent list may not be possible if the server configuration has changed or more than a few minutes have passed. The resourceVersion field returned when using this continue value will be identical to the value in the first response, unless you have received this token from an error message.",
@@ -5614,6 +5679,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.ObjectMeta": {
"description": "ObjectMeta is metadata that all persisted resources must have, which includes all objects users must create.",
"type": "object",
"properties": {
"annotations": {
"description": "Annotations is an unstructured key value map stored with a resource that may be set by external tools to store and retrieve arbitrary metadata. They are not queryable and should be preserved when modifying objects. More info: http://kubernetes.io/docs/user-guide/annotations",
@@ -5700,6 +5766,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.OwnerReference": {
"description": "OwnerReference contains enough information to let you identify an owning object. An owning object must be in the same namespace as the dependent, or be cluster-scoped, so there is no namespace field.",
"type": "object",
"required": [
"apiVersion",
"kind",
@@ -5734,10 +5801,12 @@
}
},
"io.k8s.apimachinery.pkg.apis.meta.v1.Patch": {
"description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body."
"description": "Patch is provided to give a concrete name and type to the Kubernetes PATCH request body.",
"type": "object"
},
"io.k8s.apimachinery.pkg.apis.meta.v1.Preconditions": {
"description": "Preconditions must be fulfilled before an operation (update, delete, etc.) is carried out.",
"type": "object",
"properties": {
"uid": {
"description": "Specifies the target UID.",
@@ -5747,6 +5816,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.ServerAddressByClientCIDR": {
"description": "ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.",
"type": "object",
"required": [
"clientCIDR",
"serverAddress"
@@ -5764,6 +5834,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.Status": {
"description": "Status is a return value for calls that don't return other objects.",
"type": "object",
"properties": {
"apiVersion": {
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
@@ -5809,6 +5880,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.StatusCause": {
"description": "StatusCause provides more information about an api.Status failure, including cases when multiple errors are encountered.",
"type": "object",
"properties": {
"field": {
"description": "The field of the resource that has caused this error, as named by its JSON serialization. May include dot and postfix notation for nested attributes. Arrays are zero-indexed. Fields may appear more than once in an array of causes due to fields having multiple errors. Optional.\n\nExamples:\n \"name\" - the field \"name\" on the current resource\n \"items[0].name\" - the field \"name\" on the first array entry in \"items\"",
@@ -5826,6 +5898,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.StatusDetails": {
"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.",
"type": "object",
"properties": {
"causes": {
"description": "The Causes array includes more details associated with the StatusReason failure. Not all StatusReasons may provide detailed causes.",
@@ -5864,6 +5937,7 @@
},
"io.k8s.apimachinery.pkg.apis.meta.v1.WatchEvent": {
"description": "Event represents a single event to a watched resource.",
"type": "object",
"required": [
"type",
"object"
@@ -5907,6 +5981,7 @@
},
"io.k8s.apimachinery.pkg.runtime.RawExtension": {
"description": "RawExtension is used to hold extensions in external versions.\n\nTo use this, make a field which has RawExtension as its type in your external, versioned struct, and Object in your internal struct. You also need to register your various plugin types.\n\n// Internal package: type MyAPIObject struct {\n\truntime.TypeMeta `json:\",inline\"`\n\tMyPlugin runtime.Object `json:\"myPlugin\"`\n} type PluginA struct {\n\tAOption string `json:\"aOption\"`\n}\n\n// External package: type MyAPIObject struct {\n\truntime.TypeMeta `json:\",inline\"`\n\tMyPlugin runtime.RawExtension `json:\"myPlugin\"`\n} type PluginA struct {\n\tAOption string `json:\"aOption\"`\n}\n\n// On the wire, the JSON will look something like this: {\n\t\"kind\":\"MyAPIObject\",\n\t\"apiVersion\":\"v1\",\n\t\"myPlugin\": {\n\t\t\"kind\":\"PluginA\",\n\t\t\"aOption\":\"foo\",\n\t},\n}\n\nSo what happens? Decode first uses json or yaml to unmarshal the serialized data into your external MyAPIObject. That causes the raw JSON to be stored, but not unpacked. The next step is to copy (using pkg/conversion) into the internal struct. The runtime package's DefaultScheme has conversion functions installed which will unpack the JSON stored in RawExtension, turning it into the correct object type, and storing it in the Object. (TODO: In the case where the object is of an unknown type, a runtime.Unknown object will be created and stored.)",
"type": "object",
"required": [
"Raw"
],
@@ -5925,6 +6000,7 @@
},
"io.kubesphere.kubesphere.pkg.apis.network.v1alpha1.WorkspaceNetworkPolicy": {
"description": "WorkspaceNetworkPolicy is a set of network policies applied to the scope to workspace",
"type": "object",
"properties": {
"apiVersion": {
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
@@ -5954,6 +6030,7 @@
},
"io.kubesphere.kubesphere.pkg.apis.network.v1alpha1.WorkspaceNetworkPolicyEgressRule": {
"description": "WorkspaceNetworkPolicyEgressRule describes a particular set of traffic that is allowed out of pods matched by a WorkspaceNetworkPolicySpec's podSelector. The traffic must match both ports and to.",
"type": "object",
"properties": {
"from": {
"description": "List of sources which should be able to access the pods selected for this rule. Items in this list are combined using a logical OR operation. If this field is empty or missing, this rule matches all sources (traffic not restricted by source). If this field is present and contains at least on item, this rule allows traffic only if the traffic matches at least one item in the from list.",
@@ -5973,6 +6050,7 @@
},
"io.kubesphere.kubesphere.pkg.apis.network.v1alpha1.WorkspaceNetworkPolicyIngressRule": {
"description": "WorkspaceNetworkPolicyIngressRule describes a particular set of traffic that is allowed to the pods matched by a WorkspaceNetworkPolicySpec's podSelector. The traffic must match both ports and from.",
"type": "object",
"properties": {
"from": {
"description": "List of sources which should be able to access the pods selected for this rule. Items in this list are combined using a logical OR operation. If this field is empty or missing, this rule matches all sources (traffic not restricted by source). If this field is present and contains at least on item, this rule allows traffic only if the traffic matches at least one item in the from list.",
@@ -5992,6 +6070,7 @@
},
"io.kubesphere.kubesphere.pkg.apis.network.v1alpha1.WorkspaceNetworkPolicyList": {
"description": "WorkspaceNetworkPolicyList contains a list of WorkspaceNetworkPolicy",
"type": "object",
"required": [
"items"
],
@@ -6024,6 +6103,7 @@
},
"io.kubesphere.kubesphere.pkg.apis.network.v1alpha1.WorkspaceNetworkPolicyPeer": {
"description": "WorkspaceNetworkPolicyPeer describes a peer to allow traffic from. Only certain combinations of fields are allowed. It is same as 'NetworkPolicyPeer' in k8s but with an additional field 'WorkspaceSelector'",
"type": "object",
"properties": {
"ipBlock": {
"description": "IPBlock defines policy on a particular IPBlock. If this field is set then neither of the other fields can be.",
@@ -6044,6 +6124,7 @@
},
"io.kubesphere.kubesphere.pkg.apis.network.v1alpha1.WorkspaceNetworkPolicySpec": {
"description": "WorkspaceNetworkPolicySpec defines the desired state of WorkspaceNetworkPolicy",
"type": "object",
"properties": {
"egress": {
"description": "List of egress rules to be applied to the selected pods. Outgoing traffic is allowed if there are no NetworkPolicies selecting the pod (and cluster policy otherwise allows the traffic), OR if the traffic matches at least one egress rule across all of the NetworkPolicy objects whose podSelector matches the pod. If this field is empty then this NetworkPolicy limits all outgoing traffic (and serves solely to ensure that the pods it selects are isolated by default). This field is beta-level in 1.8",
@@ -6073,10 +6154,12 @@
}
},
"io.kubesphere.kubesphere.pkg.apis.network.v1alpha1.WorkspaceNetworkPolicyStatus": {
"description": "WorkspaceNetworkPolicyStatus defines the observed state of WorkspaceNetworkPolicy"
"description": "WorkspaceNetworkPolicyStatus defines the observed state of WorkspaceNetworkPolicy",
"type": "object"
},
"io.kubesphere.kubesphere.pkg.apis.tenant.v1alpha1.Workspace": {
"description": "Workspace is the Schema for the workspaces API",
"type": "object",
"properties": {
"apiVersion": {
"description": "APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#resources",
@@ -6106,6 +6189,7 @@
},
"io.kubesphere.kubesphere.pkg.apis.tenant.v1alpha1.WorkspaceList": {
"description": "WorkspaceList contains a list of Workspace",
"type": "object",
"required": [
"items"
],
@@ -6138,6 +6222,7 @@
},
"io.kubesphere.kubesphere.pkg.apis.tenant.v1alpha1.WorkspaceSpec": {
"description": "WorkspaceSpec defines the desired state of Workspace",
"type": "object",
"properties": {
"manager": {
"type": "string"
@@ -6145,7 +6230,8 @@
}
},
"io.kubesphere.kubesphere.pkg.apis.tenant.v1alpha1.WorkspaceStatus": {
"description": "WorkspaceStatus defines the observed state of Workspace"
"description": "WorkspaceStatus defines the observed state of Workspace",
"type": "object"
}
}
}