Skip to content

Commit 7a67ec5

Browse files
marek-vebermarek-veber
committed
ARO - update after moving files
1 parent 0820424 commit 7a67ec5

10 files changed

+17
-174
lines changed

‎config/crd/bases/infrastructure.cluster.x-k8s.io_aroclusters.yaml

Lines changed: 1 addition & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
name: Endpoint
3333
priority: 1
3434
type: string
35-
name: v1beta1
35+
name: v1beta2
3636
schema:
3737
openAPIV3Schema:
3838
description: AROCluster is the Schema for the AROClusters API.
@@ -73,91 +73,10 @@ spec:
7373
- host
7474
- port
7575
type: object
76-
resources:
77-
description: Resources are embedded ARO resources to be managed by
78-
this resource.
79-
items:
80-
type: object
81-
x-kubernetes-preserve-unknown-fields: true
82-
type: array
83-
secrets:
84-
description: 'Secrets: configures where to place Azure generated secrets.'
85-
properties:
86-
adminCredentials:
87-
description: |-
88-
AdminCredentials: indicates where the AdminCredentials secret should be placed. If omitted, the secret will not be
89-
retrieved from Azure.
90-
properties:
91-
key:
92-
description: Key is the key in the Kubernetes secret being
93-
referenced.
94-
type: string
95-
name:
96-
description: |-
97-
Name is the name of the Kubernetes secret to write to.
98-
The secret will be created in the same namespace as the resource.
99-
type: string
100-
required:
101-
- key
102-
- name
103-
type: object
104-
userCredentials:
105-
description: |-
106-
UserCredentials: indicates where the UserCredentials secret should be placed. If omitted, the secret will not be
107-
retrieved from Azure.
108-
properties:
109-
key:
110-
description: Key is the key in the Kubernetes secret being
111-
referenced.
112-
type: string
113-
name:
114-
description: |-
115-
Name is the name of the Kubernetes secret to write to.
116-
The secret will be created in the same namespace as the resource.
117-
type: string
118-
required:
119-
- key
120-
- name
121-
type: object
122-
type: object
12376
type: object
12477
status:
12578
description: AROClusterStatus defines the observed state of AROCluster.
12679
properties:
127-
aadProfile:
128-
description: 'AadProfile: The Azure Active Directory configuration.'
129-
properties:
130-
adminGroupObjectIDs:
131-
description: 'AdminGroupObjectIDs: The list of AAD group object
132-
IDs that will have admin role of the cluster.'
133-
items:
134-
type: string
135-
type: array
136-
clientAppID:
137-
description: 'ClientAppID: (DEPRECATED) The client AAD application
138-
ID. Learn more at https://aka.ms/aks/aad-legacy.'
139-
type: string
140-
enableAzureRBAC:
141-
description: 'EnableAzureRBAC: Whether to enable Azure RBAC for
142-
Kubernetes authorization.'
143-
type: boolean
144-
managed:
145-
description: 'Managed: Whether to enable managed AAD.'
146-
type: boolean
147-
serverAppID:
148-
description: 'ServerAppID: (DEPRECATED) The server AAD application
149-
ID. Learn more at https://aka.ms/aks/aad-legacy.'
150-
type: string
151-
serverAppSecret:
152-
description: 'ServerAppSecret: (DEPRECATED) The server AAD application
153-
secret. Learn more at https://aka.ms/aks/aad-legacy.'
154-
type: string
155-
tenantID:
156-
description: |-
157-
TenantID: The AAD tenant ID to use for authentication. If not specified, will use the tenant of the deployment
158-
subscription.
159-
type: string
160-
type: object
16180
conditions:
16281
description: Conditions define the current service state of the AROCluster.
16382
items:
@@ -210,14 +129,6 @@ spec:
210129
- type
211130
type: object
212131
type: array
213-
currentKubernetesVersion:
214-
type: string
215-
disableLocalAccounts:
216-
description: |-
217-
DisableLocalAccounts: If set to true, getting static credentials will be disabled for this cluster. This must only be
218-
used on Managed Clusters that are AAD enabled. For more details see [disable local
219-
accounts](https://docs.microsoft.com/azure/aks/managed-aad#disable-local-accounts-preview).
220-
type: boolean
221132
failureDomains:
222133
additionalProperties:
223134
description: |-
@@ -238,80 +149,9 @@ spec:
238149
description: FailureDomains specifies a list fo available availability
239150
zones that can be used
240151
type: object
241-
fqdn:
242-
description: 'Fqdn: The FQDN of the master pool.'
243-
type: string
244-
longRunningOperationStates:
245-
description: |-
246-
LongRunningOperationStates saves the state for ARO long-running operations so they can be continued on the
247-
next reconciliation loop.
248-
items:
249-
description: Future contains the data needed for an Azure long-running
250-
operation to continue across reconcile loops.
251-
properties:
252-
data:
253-
description: Data is the base64 url encoded json Azure AutoRest
254-
Future.
255-
type: string
256-
name:
257-
description: |-
258-
Name is the name of the Azure resource.
259-
Together with the service name, this forms the unique identifier for the future.
260-
type: string
261-
resourceGroup:
262-
description: ResourceGroup is the Azure resource group for the
263-
resource.
264-
type: string
265-
serviceName:
266-
description: |-
267-
ServiceName is the name of the Azure service.
268-
Together with the name of the resource, this forms the unique identifier for the future.
269-
type: string
270-
type:
271-
description: Type describes the type of future, such as update,
272-
create, delete, etc.
273-
type: string
274-
required:
275-
- data
276-
- name
277-
- serviceName
278-
- type
279-
type: object
280-
type: array
281-
privateFQDN:
282-
description: 'PrivateFQDN: The FQDN of private cluster.'
283-
type: string
284152
ready:
285153
description: Ready is when the AROControlPlane has a API server URL.
286154
type: boolean
287-
resources:
288-
items:
289-
description: ResourceStatus represents the status of a resource.
290-
properties:
291-
ready:
292-
type: boolean
293-
resource:
294-
description: StatusResource is a handle to a resource.
295-
properties:
296-
group:
297-
type: string
298-
kind:
299-
type: string
300-
name:
301-
type: string
302-
version:
303-
type: string
304-
required:
305-
- group
306-
- kind
307-
- name
308-
- version
309-
type: object
310-
required:
311-
- ready
312-
- resource
313-
type: object
314-
type: array
315155
type: object
316156
type: object
317157
served: true

‎config/crd/bases/infrastructure.cluster.x-k8s.io_arocontrolplanes.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ kind: CustomResourceDefinition
44
metadata:
55
annotations:
66
controller-gen.kubebuilder.io/version: v0.16.1
7-
name: arocontrolplanes.infrastructure.cluster.x-k8s.io
7+
name: arocontrolplanes.controlplane.cluster.x-k8s.io
88
spec:
9-
group: infrastructure.cluster.x-k8s.io
9+
group: controlplane.cluster.x-k8s.io
1010
names:
1111
categories:
1212
- cluster-api
@@ -27,7 +27,7 @@ spec:
2727
jsonPath: .status.ready
2828
name: Ready
2929
type: string
30-
name: v1beta1
30+
name: v1beta2
3131
schema:
3232
openAPIV3Schema:
3333
description: AROControlPlane is the Schema for the AROControlPlanes API.

‎config/crd/bases/infrastructure.cluster.x-k8s.io_aromachinepools.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
jsonPath: .status.replicas
2828
name: Replicas
2929
type: integer
30-
name: v1beta1
30+
name: v1beta2
3131
schema:
3232
openAPIV3Schema:
3333
description: AROMachinePool is the Schema for the aromachinepools API.

‎config/crd/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ resources:
2525
- bases/infrastructure.cluster.x-k8s.io_azureasomanagedmachinepools.yaml
2626
- bases/infrastructure.cluster.x-k8s.io_azureasomanagedmachinepooltemplates.yaml
2727
- bases/infrastructure.cluster.x-k8s.io_aroclusters.yaml
28-
- bases/infrastructure.cluster.x-k8s.io_arocontrolplanes.yaml
2928
- bases/infrastructure.cluster.x-k8s.io_aromachinepools.yaml
29+
- bases/controlplane.cluster.x-k8s.io_arocontrolplanes.yaml
3030
# +kubebuilder:scaffold:crdkustomizeresource
3131

3232
patches:

‎config/crd/patches/cainjection_in_arocontrolplanes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@ kind: CustomResourceDefinition
55
metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME)
8-
name: arocontrolplanes.infrastructure.cluster.x-k8s.io
8+
name: arocontrolplanes.controlplane.cluster.x-k8s.io

‎config/crd/patches/capicontract_in_arocontrolplanes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
4-
name: arocontrolplanes.infrastructure.cluster.x-k8s.io
4+
name: arocontrolplanes.controlplane.cluster.x-k8s.io
55
labels:
66
cluster.x-k8s.io/v1beta1: v1beta1

‎exp/api/controlplane/v1beta2/groupversion_info.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616

1717
// Package v1beta2 contains API Schema definitions for the exp v1beta2 API group
1818
// +kubebuilder:object:generate=true
19+
// +groupName=controlplane.cluster.x-k8s.io
1920
package v1beta2
2021

2122
import (

‎exp/api/v1beta2/groupversion_info.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ limitations under the License.
1616

1717
// Package v1beta2 contains API Schema definitions for the exp v1beta2 API group
1818
// +kubebuilder:object:generate=true
19+
// +groupName=infrastructure.cluster.x-k8s.io
1920
package v1beta2
2021

2122
import (

‎exp/controllers/arocluster_controller.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ import (
3333
"sigs.k8s.io/controller-runtime/pkg/handler"
3434
)
3535

36-
// AROClusterReconciler reconciles a AroCluster object.
36+
// AROClusterReconciler reconciles a AROCluster object.
3737
type AROClusterReconciler struct {
3838
client.Client
3939
WatchFilterValue string
@@ -75,7 +75,7 @@ func (r *AROClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Ma
7575
//+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=aroclusters/status,verbs=get;update;patch
7676
//+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=aroclusters/finalizers,verbs=update
7777

78-
// Reconcile reconciles an AroCluster.
78+
// Reconcile reconciles an AROCluster.
7979
func (r *AROClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (result ctrl.Result, resultErr error) {
8080
ctx, log, done := tele.StartSpanWithLogger(ctx,
8181
"controllers.AROClusterReconciler.Reconcile",

‎exp/controllers/arocontrolplane_controller.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"sigs.k8s.io/controller-runtime/pkg/client"
2727
"sigs.k8s.io/controller-runtime/pkg/controller"
2828

29+
control2exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/controlplane/v1beta2"
2930
infrav2exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1beta2"
3031
"sigs.k8s.io/cluster-api-provider-azure/util/tele"
3132
)
@@ -40,13 +41,13 @@ type AROControlPlaneReconciler struct {
4041
func (r *AROControlPlaneReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager, options controller.Options) error {
4142
_, log, done := tele.StartSpanWithLogger(ctx,
4243
"controllers.AROControlPlaneReconciler.SetupWithManager",
43-
tele.KVP("controller", v1beta2.AROControlPlaneKind),
44+
tele.KVP("controller", control2exp.AROControlPlaneKind),
4445
)
4546
defer done()
4647

4748
_, err := ctrl.NewControllerManagedBy(mgr).
4849
WithOptions(options).
49-
For(&v1beta2.AROControlPlane{}).
50+
For(&control2exp.AROControlPlane{}).
5051
WithEventFilter(predicates.ResourceHasFilterLabel(mgr.GetScheme(), log, r.WatchFilterValue)).
5152
Owns(&corev1.Secret{}).
5253
Build(r)
@@ -67,13 +68,13 @@ func (r *AROControlPlaneReconciler) Reconcile(ctx context.Context, req ctrl.Requ
6768
"controllers.AROControlPlaneReconciler.Reconcile",
6869
tele.KVP("namespace", req.Namespace),
6970
tele.KVP("name", req.Name),
70-
tele.KVP("kind", v1beta2.AROControlPlaneKind),
71+
tele.KVP("kind", control2exp.AROControlPlaneKind),
7172
)
7273
defer done()
7374

7475
log = log.WithValues("namespace", req.Namespace, "azureControlPlane", req.Name)
7576

76-
aroControlPlane := &v1beta2.AROControlPlane{}
77+
aroControlPlane := &control2exp.AROControlPlane{}
7778
err := r.Get(ctx, req.NamespacedName, aroControlPlane)
7879
if err != nil {
7980
return ctrl.Result{}, client.IgnoreNotFound(err)

0 commit comments

Comments
 (0)