Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-ocm-2.12] NO-ISSUE: Bump controller-gen version #7114

Open
wants to merge 1 commit into
base: release-ocm-2.12
Choose a base branch
from
+3,293 −3,052
Open

[release-ocm-2.12] NO-ISSUE: Bump controller-gen version #7114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/common/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/hiveextension/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api/v1beta1/zz_generated.deepcopy.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ci-images/Dockerfile.code-generation
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ COPY --from=registry.k8s.io/kustomize/kustomize:v4.3.0 /app/kustomize /usr/bin/
RUN cd / && /assisted-service/hack/setup_env.sh spectral && \
/assisted-service/hack/setup_env.sh jq && \
go install github.com/golang/mock/[email protected] && \
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.6.2 && \
go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0 && \
go install golang.org/x/tools/cmd/[email protected] && \
chmod 775 -R $GOPATH

Expand Down
41 changes: 20 additions & 21 deletions config/crd/bases/agent-install.openshift.io_agentclassifications.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: agentclassifications.agent-install.openshift.io
spec:
group: agent-install.openshift.io
Expand All @@ -23,14 +21,19 @@ spec:
API
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/sig-architecture/api-conventions.md#resources'
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/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -46,10 +49,11 @@ spec:
Agents
type: string
query:
description: Query is in gojq format (https://github.com/itchyny/gojq#difference-to-jq)
and will be invoked on each Agent's inventory. The query should
return a boolean. The operator will apply the label to any Agent
for which "true" is returned.
description: |-
Query is in gojq format (https://github.com/itchyny/gojq#difference-to-jq)
and will be invoked on each Agent's inventory. The query should return a
boolean. The operator will apply the label to any Agent for which "true"
is returned.
type: string
required:
- labelKey
Expand All @@ -61,8 +65,9 @@ spec:
properties:
conditions:
items:
description: Condition represents the state of the operator's reconciliation
functionality.
description: |-
Condition represents the state of the operator's
reconciliation functionality.
properties:
lastHeartbeatTime:
format: date-time
Expand Down Expand Up @@ -99,9 +104,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
61 changes: 38 additions & 23 deletions config/crd/bases/agent-install.openshift.io_agents.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@

---
apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.6.2
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: agents.agent-install.openshift.io
spec:
group: agent-install.openshift.io
Expand Down Expand Up @@ -49,14 +47,19 @@ spec:
description: Agent is the Schema for the hosts API
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/sig-architecture/api-conventions.md#resources'
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/sig-architecture/api-conventions.md#resources
type: string
kind:
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind is a string value representing the REST resource this object represents.
Servers may infer this from the endpoint the client submits requests to.
Cannot be updated.
In CamelCase.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
metadata:
type: object
Expand All @@ -66,8 +69,9 @@ spec:
approved:
type: boolean
clusterDeploymentName:
description: ClusterReference represents a Cluster Reference. It has
enough information to retrieve cluster in any namespace
description: |-
ClusterReference represents a Cluster Reference. It has enough information to retrieve cluster
in any namespace
properties:
name:
description: Name is unique within a namespace to reference a
Expand Down Expand Up @@ -123,7 +127,11 @@ spec:
with this agent
type: object
role:
description: "HostRole host role \n swagger:model host-role"
description: |-
HostRole host role


swagger:model host-role
type: string
required:
- approved
Expand All @@ -136,8 +144,9 @@ spec:
type: boolean
conditions:
items:
description: Condition represents the state of the operator's reconciliation
functionality.
description: |-
Condition represents the state of the operator's
reconciliation functionality.
properties:
lastHeartbeatTime:
format: date-time
Expand Down Expand Up @@ -356,7 +365,11 @@ spec:
sourceName:
type: string
sourceState:
description: "SourceState source state \n swagger:model source_state"
description: |-
SourceState source state


swagger:model source_state
type: string
type: object
type: array
Expand All @@ -377,7 +390,11 @@ spec:
description: All stages (ordered by their appearance) for this
agent
items:
description: "HostStage host stage \n swagger:model host-stage"
description: |-
HostStage host stage


swagger:model host-stage
type: string
type: array
stageStartTime:
Expand All @@ -390,7 +407,11 @@ spec:
type: string
type: object
role:
description: "HostRole host role \n swagger:model host-role"
description: |-
HostRole host role


swagger:model host-role
type: string
validationsInfo:
additionalProperties:
Expand Down Expand Up @@ -418,9 +439,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading