Skip to content

Commit

Permalink
Bump k8s dependencies to 0.28.0 (open-telemetry#2031)
Browse files Browse the repository at this point in the history
  • Loading branch information
@swiatekm
swiatekm authored Aug 17, 2023
1 parent 7c2a82b commit 26d9a70
Show file tree
Hide file tree
Showing 5 changed files with 115 additions and 90 deletions.
43 changes: 29 additions & 14 deletions bundle/manifests/opentelemetry.io_opentelemetrycollectors.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -793,6 +793,11 @@ spec:
resources required.
type: object
type: object
restartPolicy:
description: RestartPolicy defines the restart behavior of individual
containers in a pod. This field may only be set for init containers,
and the only allowed value is "Always".
type: string
securityContext:
description: SecurityContext defines the security options the
container should be run with. If set, the fields of SecurityContext
Expand Down Expand Up @@ -3069,6 +3074,11 @@ spec:
resources required.
type: object
type: object
restartPolicy:
description: RestartPolicy defines the restart behavior of individual
containers in a pod. This field may only be set for init containers,
and the only allowed value is "Always".
type: string
securityContext:
description: SecurityContext defines the security options the
container should be run with. If set, the fields of SecurityContext
Expand Down Expand Up @@ -3826,10 +3836,10 @@ spec:
description: ServicePort contains information on service's port.
properties:
appProtocol:
description: The application protocol for this port. This field
follows standard Kubernetes label syntax. Un-prefixed names
are reserved for IANA standard service names (as per RFC-6335
and https://www.iana.
description: The application protocol for this port. This is
used as a hint for implementations to offer richer behavior
for protocols that they understand. This field follows standard
Kubernetes label syntax.
type: string
name:
description: The name of this port within the service. This
Expand Down Expand Up @@ -4720,17 +4730,28 @@ spec:
items:
type: string
type: array
allocatedResourceStatuses:
additionalProperties:
description: When a controller receives persistentvolume
claim update with ClaimResourceStatus for a resource
that it does not recognizes, then it should ignore that
update and let other controllers handle it.
type: string
description: allocatedResourceStatuses stores status of
resource being resized for the given PVC. Key names follow
standard Kubernetes label syntax.
type: object
x-kubernetes-map-type: granular
allocatedResources:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: allocatedResources is the storage resource
within AllocatedResources tracks the capacity allocated
to a PVC. It may be larger than the actual capacity when
a volume expansion operation is requested.
description: allocatedResources tracks the resources allocated
to a PVC including its capacity. Key names follow standard
Kubernetes label syntax.
type: object
capacity:
additionalProperties:
Expand Down Expand Up @@ -4783,12 +4804,6 @@ spec:
phase:
description: phase represents the current phase of PersistentVolumeClaim.
type: string
resizeStatus:
description: resizeStatus stores status of resize operation.
ResizeStatus is not set by default but when expansion
is complete resizeStatus is set to empty string by resize
controller or kubelet.
type: string
type: object
type: object
type: array
Expand Down
43 changes: 29 additions & 14 deletions config/crd/bases/opentelemetry.io_opentelemetrycollectors.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,11 @@ spec:
resources required.
type: object
type: object
restartPolicy:
description: RestartPolicy defines the restart behavior of individual
containers in a pod. This field may only be set for init containers,
and the only allowed value is "Always".
type: string
securityContext:
description: SecurityContext defines the security options the
container should be run with. If set, the fields of SecurityContext
Expand Down Expand Up @@ -3066,6 +3071,11 @@ spec:
resources required.
type: object
type: object
restartPolicy:
description: RestartPolicy defines the restart behavior of individual
containers in a pod. This field may only be set for init containers,
and the only allowed value is "Always".
type: string
securityContext:
description: SecurityContext defines the security options the
container should be run with. If set, the fields of SecurityContext
Expand Down Expand Up @@ -3823,10 +3833,10 @@ spec:
description: ServicePort contains information on service's port.
properties:
appProtocol:
description: The application protocol for this port. This field
follows standard Kubernetes label syntax. Un-prefixed names
are reserved for IANA standard service names (as per RFC-6335
and https://www.iana.
description: The application protocol for this port. This is
used as a hint for implementations to offer richer behavior
for protocols that they understand. This field follows standard
Kubernetes label syntax.
type: string
name:
description: The name of this port within the service. This
Expand Down Expand Up @@ -4717,17 +4727,28 @@ spec:
items:
type: string
type: array
allocatedResourceStatuses:
additionalProperties:
description: When a controller receives persistentvolume
claim update with ClaimResourceStatus for a resource
that it does not recognizes, then it should ignore that
update and let other controllers handle it.
type: string
description: allocatedResourceStatuses stores status of
resource being resized for the given PVC. Key names follow
standard Kubernetes label syntax.
type: object
x-kubernetes-map-type: granular
allocatedResources:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: allocatedResources is the storage resource
within AllocatedResources tracks the capacity allocated
to a PVC. It may be larger than the actual capacity when
a volume expansion operation is requested.
description: allocatedResources tracks the resources allocated
to a PVC including its capacity. Key names follow standard
Kubernetes label syntax.
type: object
capacity:
additionalProperties:
Expand Down Expand Up @@ -4780,12 +4801,6 @@ spec:
phase:
description: phase represents the current phase of PersistentVolumeClaim.
type: string
resizeStatus:
description: resizeStatus stores status of resize operation.
ResizeStatus is not set by default but when expansion
is complete resizeStatus is set to empty string by resize
controller or kubelet.
type: string
type: object
type: object
type: array
Expand Down
32 changes: 23 additions & 9 deletions docs/api.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3982,6 +3982,13 @@ A single application container that you want to run within a pod.
Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>restartPolicy</b></td>
<td>string</td>
<td>
RestartPolicy defines the restart behavior of individual containers in a pod. This field may only be set for init containers, and the only allowed value is "Always".<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#opentelemetrycollectorspecadditionalcontainersindexsecuritycontext">securityContext</a></b></td>
<td>object</td>
Expand Down Expand Up @@ -8624,6 +8631,13 @@ A single application container that you want to run within a pod.
Compute Resources required by this container. Cannot be updated. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>restartPolicy</b></td>
<td>string</td>
<td>
RestartPolicy defines the restart behavior of individual containers in a pod. This field may only be set for init containers, and the only allowed value is "Always".<br/>
</td>
<td>false</td>
</tr><tr>
<td><b><a href="#opentelemetrycollectorspecinitcontainersindexsecuritycontext">securityContext</a></b></td>
<td>object</td>
Expand Down Expand Up @@ -11694,7 +11708,7 @@ ServicePort contains information on service's port.
<td><b>appProtocol</b></td>
<td>string</td>
<td>
The application protocol for this port. This field follows standard Kubernetes label syntax. Un-prefixed names are reserved for IANA standard service names (as per RFC-6335 and https://www.iana.<br/>
The application protocol for this port. This is used as a hint for implementations to offer richer behavior for protocols that they understand. This field follows standard Kubernetes label syntax.<br/>
</td>
<td>false</td>
</tr><tr>
Expand Down Expand Up @@ -13345,11 +13359,18 @@ status represents the current information/status of a persistent volume claim. R
accessModes contains the actual access modes the volume backing the PVC has. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#access-modes-1<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>allocatedResourceStatuses</b></td>
<td>map[string]string</td>
<td>
allocatedResourceStatuses stores status of resource being resized for the given PVC. Key names follow standard Kubernetes label syntax.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>allocatedResources</b></td>
<td>map[string]int or string</td>
<td>
allocatedResources is the storage resource within AllocatedResources tracks the capacity allocated to a PVC. It may be larger than the actual capacity when a volume expansion operation is requested.<br/>
allocatedResources tracks the resources allocated to a PVC including its capacity. Key names follow standard Kubernetes label syntax.<br/>
</td>
<td>false</td>
</tr><tr>
Expand All @@ -13373,13 +13394,6 @@ status represents the current information/status of a persistent volume claim. R
phase represents the current phase of PersistentVolumeClaim.<br/>
</td>
<td>false</td>
</tr><tr>
<td><b>resizeStatus</b></td>
<td>string</td>
<td>
resizeStatus stores status of resize operation. ResizeStatus is not set by default but when expansion is complete resizeStatus is set to empty string by resize controller or kubelet.<br/>
</td>
<td>false</td>
</tr></tbody>
</table>

Expand Down
22 changes: 11 additions & 11 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ require (
go.opentelemetry.io/collector/featuregate v0.77.0
go.opentelemetry.io/otel v1.16.0
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.27.4
k8s.io/apiextensions-apiserver v0.27.4
k8s.io/apimachinery v0.27.4
k8s.io/client-go v0.27.4
k8s.io/component-base v0.27.4
k8s.io/kubectl v0.27.4
k8s.io/api v0.28.0
k8s.io/apiextensions-apiserver v0.28.0
k8s.io/apimachinery v0.28.0
k8s.io/client-go v0.28.0
k8s.io/component-base v0.28.0
k8s.io/kubectl v0.28.0
sigs.k8s.io/controller-runtime v0.15.1
)

Expand Down Expand Up @@ -72,7 +72,7 @@ require (
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gnostic-models v0.6.8 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand All @@ -97,7 +97,7 @@ require (
github.com/hashicorp/serf v0.10.1 // indirect
github.com/hetznercloud/hcloud-go/v2 v2.0.0 // indirect
github.com/imdario/mergo v0.3.16 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/ionos-cloud/sdk-go/v6 v6.1.8 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
Expand Down Expand Up @@ -128,7 +128,7 @@ require (
github.com/prometheus/common/sigv4 v0.1.0 // indirect
github.com/prometheus/procfs v0.11.0 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.19 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/spf13/cobra v1.7.0 // indirect
github.com/vultr/govultr/v2 v2.17.2 // indirect
go.opencensus.io v0.24.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
Expand All @@ -138,7 +138,7 @@ require (
golang.org/x/crypto v0.11.0 // indirect
golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.12.0 // indirect
golang.org/x/net v0.13.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
Expand All @@ -157,7 +157,7 @@ require (
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/klog/v2 v2.100.1 // indirect
k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
k8s.io/utils v0.0.0-20230711102312-30195339c3c7 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.3.0 // indirect
Expand Down
Loading

0 comments on commit 26d9a70

Please sign in to comment.