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-4.14] OCPBUGS-19794: Upgrade Agent APIs to v1beta1 #3059

Merged
merged 2 commits into from
Oct 10, 2023
Merged

[release-4.14] OCPBUGS-19794: Upgrade Agent APIs to v1beta1 #3059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa87999
Merge pull request #3022 from CrystalChun/upgrade-agent
openshift-merge-robot Sep 25, 2023
958e002
Merge pull request #3050 from CrystalChun/fix-crd
openshift-merge-robot Sep 28, 2023
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ cluster-api-provider-kubevirt: $(CONTROLLER_GEN)
.PHONY: cluster-api-provider-agent
cluster-api-provider-agent: $(CONTROLLER_GEN)
rm -rf cmd/install/assets/cluster-api-provider-agent/*.yaml
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/github.com/openshift/cluster-api-provider-agent/api/v1alpha1" output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-agent
$(CONTROLLER_GEN) $(CRD_OPTIONS) paths="./vendor/github.com/openshift/cluster-api-provider-agent/api/..." output:crd:artifacts:config=cmd/install/assets/cluster-api-provider-agent

.PHONY: cluster-api-provider-azure
cluster-api-provider-azure: $(CONTROLLER_GEN)
Expand Down
2 changes: 1 addition & 1 deletion api/scheme.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
operatorv1alpha1 "github.com/openshift/api/operator/v1alpha1"
routev1 "github.com/openshift/api/route/v1"
securityv1 "github.com/openshift/api/security/v1"
agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1alpha1"
agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1beta1"
hyperv1alpha1 "github.com/openshift/hypershift/api/v1alpha1"
hyperv1beta1 "github.com/openshift/hypershift/api/v1beta1"
"github.com/openshift/hypershift/support/rhobsmonitoring"
Expand Down
2 changes: 1 addition & 1 deletion cmd/cluster/core/dump.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
imagev1 "github.com/openshift/api/image/v1"
routev1 "github.com/openshift/api/route/v1"
securityv1 "github.com/openshift/api/security/v1"
agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1alpha1"
agentv1 "github.com/openshift/cluster-api-provider-agent/api/v1beta1"
"github.com/spf13/cobra"
appsv1 "k8s.io/api/apps/v1"
batchv1 "k8s.io/api/batch/v1"
Expand Down
6 changes: 3 additions & 3 deletions cmd/install/assets/assets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ var capiResources = map[string]string{
"cluster-api-provider-kubevirt/infrastructure.cluster.x-k8s.io_kubevirtclusters.yaml": "v1alpha1",
"cluster-api-provider-kubevirt/infrastructure.cluster.x-k8s.io_kubevirtmachines.yaml": "v1alpha1",
"cluster-api-provider-kubevirt/infrastructure.cluster.x-k8s.io_kubevirtmachinetemplates.yaml": "v1alpha1",
"cluster-api-provider-agent/capi-provider.agent-install.openshift.io_agentclusters.yaml": "v1alpha1",
"cluster-api-provider-agent/capi-provider.agent-install.openshift.io_agentmachinetemplates.yaml": "v1alpha1",
"cluster-api-provider-agent/capi-provider.agent-install.openshift.io_agentmachines.yaml": "v1alpha1",
"cluster-api-provider-agent/capi-provider.agent-install.openshift.io_agentclusters.yaml": "v1beta1",
"cluster-api-provider-agent/capi-provider.agent-install.openshift.io_agentmachinetemplates.yaml": "v1beta1",
"cluster-api-provider-agent/capi-provider.agent-install.openshift.io_agentmachines.yaml": "v1beta1",
"cluster-api-provider-azure/infrastructure.cluster.x-k8s.io_azureclusters.yaml": "v1beta1",
"cluster-api-provider-azure/infrastructure.cluster.x-k8s.io_azuremachines.yaml": "v1beta1",
"cluster-api-provider-azure/infrastructure.cluster.x-k8s.io_azuremachinetemplates.yaml": "v1beta1",
Expand Down
156 changes: 155 additions & 1 deletion ...ts/cluster-api-provider-agent/capi-provider.agent-install.openshift.io_agentclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,161 @@ spec:
singular: agentcluster
scope: Namespaced
versions:
- name: v1alpha1
- deprecated: true
deprecationWarning: v1alpha1 is a deprecated version for AgentCluster
name: v1alpha1
schema:
openAPIV3Schema:
description: AgentCluster is the Schema for the agentclusters 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'
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'
type: string
metadata:
type: object
spec:
description: AgentClusterSpec defines the desired state of AgentCluster
properties:
controlPlaneEndpoint:
description: ControlPlaneEndpoint represents the endpoint used to
communicate with the control plane.
properties:
host:
description: The hostname on which the API server is serving.
type: string
port:
description: The port on which the API server is serving.
format: int32
type: integer
required:
- host
- port
type: object
ignitionEndpoint:
description: IgnitionEndpoint store the data to of the custom ignition
endpoint.
properties:
caCertificateReference:
description: CaCertificateReference is a reference to the secret
containing CA certificate to be used when contacting the URL
via HTTPS.
properties:
name:
description: Name is the name of the secret containing the
CA certificate.
type: string
namespace:
description: Namespace is the namespace of the secret containing
the CA certificate.
type: string
required:
- name
- namespace
type: object
url:
description: Url store the URL of the custom ignition endpoint.
type: string
type: object
type: object
status:
description: AgentClusterStatus defines the observed state of AgentCluster
properties:
clusterDeploymentReference:
description: ClusterDeploymentRef is a reference to the associated
Hive ClusterDeployment.
properties:
name:
description: Name is unique within a namespace to reference a
clusterDeployment resource.
type: string
namespace:
description: Namespace defines the space within which the clusterDeployment
name must be unique.
type: string
type: object
conditions:
description: Conditions defines current service state of the ClusterDeployment.
items:
description: Condition defines an observation of a Cluster API resource
operational state.
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another. This should be when the underlying condition changed.
If that is not known, then using the time when the API field
changed is acceptable.
format: date-time
type: string
message:
description: A human readable message indicating details about
the transition. This field may be empty.
type: string
reason:
description: The reason for the condition's last transition
in CamelCase. The specific API may choose whether or not this
field is considered a guaranteed API. This field may not be
empty.
type: string
severity:
description: Severity provides an explicit classification of
Reason code, so the users or machines can immediately understand
the current situation and act accordingly. The Severity field
MUST be set only when Status=False.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important.
type: string
required:
- lastTransitionTime
- status
- type
type: object
type: array
failureDomains:
additionalProperties:
description: FailureDomainSpec is the Schema for Cluster API failure
domains. It allows controllers to understand how many failure
domains a cluster can optionally span across.
properties:
attributes:
additionalProperties:
type: string
description: Attributes is a free form map of attributes an
infrastructure provider might use or require.
type: object
controlPlane:
description: ControlPlane determines if this failure domain
is suitable for use by control plane machines.
type: boolean
type: object
description: FailureDomains is a list of failure domain objects synced
from the infrastructure provider.
type: object
ready:
type: boolean
required:
- clusterDeploymentReference
type: object
type: object
served: true
storage: false
subresources:
status: {}
- name: v1beta1
schema:
openAPIV3Schema:
description: AgentCluster is the Schema for the agentclusters API
Expand Down
Loading