diff --git a/apis/core/v1alpha2/zz_generated.deepcopy.go b/apis/core/v1alpha2/zz_generated.deepcopy.go index 121b943..fe278cb 100644 --- a/apis/core/v1alpha2/zz_generated.deepcopy.go +++ b/apis/core/v1alpha2/zz_generated.deepcopy.go @@ -1,3 +1,4 @@ +//go:build !ignore_autogenerated // +build !ignore_autogenerated /* @@ -717,7 +718,7 @@ func (in *ContainerPort) DeepCopyInto(out *ContainerPort) { *out = *in if in.Protocol != nil { in, out := &in.Protocol, &out.Protocol - *out = new(TransportProtocol) + *out = new(v1.Protocol) **out = **in } } @@ -854,15 +855,15 @@ func (in *ContainerizedWorkloadSpec) DeepCopyInto(out *ContainerizedWorkloadSpec *out = new(string) **out = **in } - if in.Containers != nil { - in, out := &in.Containers, &out.Containers + if in.InitContainers != nil { + in, out := &in.InitContainers, &out.InitContainers *out = make([]Container, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) } } - if in.InitContainers != nil { - in, out := &in.InitContainers, &out.InitContainers + if in.Containers != nil { + in, out := &in.Containers, &out.Containers *out = make([]Container, len(*in)) for i := range *in { (*in)[i].DeepCopyInto(&(*out)[i]) @@ -1112,7 +1113,6 @@ func (in *ExtendedResource) DeepCopy() *ExtendedResource { func (in *GPUResources) DeepCopyInto(out *GPUResources) { *out = *in out.Required = in.Required.DeepCopy() - out.Limits = in.Limits.DeepCopy() } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GPUResources. diff --git a/charts/oam-kubernetes-runtime/crds/core.oam.dev_applicationconfigurations.yaml b/charts/oam-kubernetes-runtime/crds/core.oam.dev_applicationconfigurations.yaml index 445c221..a770d8a 100644 --- a/charts/oam-kubernetes-runtime/crds/core.oam.dev_applicationconfigurations.yaml +++ b/charts/oam-kubernetes-runtime/crds/core.oam.dev_applicationconfigurations.yaml @@ -252,7 +252,6 @@ spec: type: array required: - components - - volumeClaims type: object status: description: An ApplicationConfigurationStatus represents the observed state of a ApplicationConfiguration. diff --git a/charts/oam-kubernetes-runtime/crds/core.oam.dev_containerizedworkloads.yaml b/charts/oam-kubernetes-runtime/crds/core.oam.dev_containerizedworkloads.yaml index d5a616e..1b4f3b3 100644 --- a/charts/oam-kubernetes-runtime/crds/core.oam.dev_containerizedworkloads.yaml +++ b/charts/oam-kubernetes-runtime/crds/core.oam.dev_containerizedworkloads.yaml @@ -86,7 +86,8 @@ spec: description: Value that should be written to the configuration file. type: string required: - - path + - path + - value type: object type: array env: @@ -222,15 +223,21 @@ spec: format: int32 type: integer hostPort: + description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. format: int32 type: integer name: type: string + nodePort: + description: 'The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport' + format: int32 + type: integer protocol: - description: 'TODO(negz): Use +kubebuilder:default marker to default Protocol to TCP once we''re generating v1 CRDs. Protocol used by the server listening on this port.' + description: once we're generating v1 CRDs. Protocol used by the server listening on this port. enum: - - TCP - - UDP + - TCP + - UDP + - SCTP type: string required: - containerPort @@ -329,7 +336,6 @@ spec: description: CPU required by this container. properties: limits: - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' type: string required: description: Required CPU count. 1.0 represents one CPU core. @@ -359,13 +365,10 @@ spec: gpu: description: GPU required by this container. properties: - limits: - type: string required: description: Required GPU count. type: string required: - - limits - required type: object memory: @@ -377,7 +380,6 @@ spec: description: Required memory. type: string required: - - limits - required type: object volumes: @@ -438,6 +440,7 @@ spec: enum: - HelmRelease - ContainerizedWorkload + - Third type: string name: description: Name of the referenced object. @@ -447,8 +450,11 @@ spec: - name type: object type: array + forceUpdateTimestamp: + description: ForceUpdateTimestamp + type: string initContainers: - description: An ApplicationConfigurationSpec defines the desired state of a + description: InitContainers of which this workload initContainers. items: description: A Container represents an Open Containers Initiative (OCI) container. properties: @@ -491,6 +497,7 @@ spec: type: string required: - path + - value type: object type: array env: @@ -626,15 +633,21 @@ spec: format: int32 type: integer hostPort: + description: Number of port to expose on the host. If specified, this must be a valid port number, 0 < x < 65536. If HostNetwork is specified, this must match ContainerPort. Most containers do not need this. format: int32 type: integer name: type: string + nodePort: + description: 'The port on each node on which this service is exposed when type=NodePort or LoadBalancer. Usually assigned by the system. If specified, it will be allocated to the service if unused or else creation of the service will fail. Default is to auto-allocate a port if the ServiceType of this Service requires one. More info: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport' + format: int32 + type: integer protocol: - description: 'TODO(negz): Use +kubebuilder:default marker to default Protocol to TCP once we''re generating v1 CRDs. Protocol used by the server listening on this port.' + description: once we're generating v1 CRDs. Protocol used by the server listening on this port. enum: - TCP - UDP + - SCTP type: string required: - containerPort @@ -733,7 +746,6 @@ spec: description: CPU required by this container. properties: limits: - description: 'Limits describes the maximum amount of compute resources allowed. More info: https://kubernetes.io/docs/concepts/configuration/manage-compute-resources-container/' type: string required: description: Required CPU count. 1.0 represents one CPU core. @@ -763,13 +775,10 @@ spec: gpu: description: GPU required by this container. properties: - limits: - type: string required: description: Required GPU count. type: string required: - - limits - required type: object memory: @@ -781,7 +790,6 @@ spec: description: Required memory. type: string required: - - limits - required type: object volumes: @@ -841,15 +849,21 @@ spec: osType: description: OperatingSystem required by this workload. enum: - - linux - - windows + - linux + - windows type: string pointToGrayName: description: old grey workload name need modify match selector type: string serviceMesh: - description: check is install istio + description: check add istio label type: boolean + serviceType: + description: 'ServiceType determines how the Service is exposed. Defaults to ClusterIP. Valid options are ExternalName, ClusterIP, NodePort, and LoadBalancer. "ExternalName" maps to the specified externalName. "ClusterIP" allocates a cluster-internal IP address for load-balancing to endpoints. Endpoints are determined by the selector or if that is not specified, by manual construction of an Endpoints object. If clusterIP is "None", no virtual IP is allocated and the endpoints are published as a set of endpoints rather than a stable IP. "NodePort" builds on ClusterIP and allocates a port on every node which routes to the clusterIP. "LoadBalancer" builds on NodePort and creates an external load-balancer (if supported in the current cloud) which routes to the clusterIP. More info: https://kubernetes.io/docs/concepts/services-networking/service/' + type: string + type: + description: Type support deployment and statefulSet + type: string required: - containers type: object diff --git a/charts/oam-kubernetes-runtime/crds/core.oam.dev_volumetraits.yaml b/charts/oam-kubernetes-runtime/crds/core.oam.dev_volumetraits.yaml index b2b9433..b83b457 100644 --- a/charts/oam-kubernetes-runtime/crds/core.oam.dev_volumetraits.yaml +++ b/charts/oam-kubernetes-runtime/crds/core.oam.dev_volumetraits.yaml @@ -40,6 +40,8 @@ spec: properties: containerIndex: type: integer + isInitContainer: + type: boolean paths: items: properties: @@ -65,7 +67,8 @@ spec: type: object type: array required: - - containerIndex + - containerIndex + - isInitContainer - paths type: object type: array