Skip to content

Commit 2c9ecd7

Browse files
nojnhuhnojnhuh
committed
ASOAPI: add resource reconciliation
1 parent 3d9f761 commit 2c9ecd7

24 files changed

+1028
-26
lines changed

‎Tiltfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,11 @@ def create_identity_secret():
255255
os.putenv("AZURE_CLUSTER_IDENTITY_SECRET_NAME", "cluster-identity-secret")
256256
os.putenv("AZURE_CLUSTER_IDENTITY_SECRET_NAMESPACE", "default")
257257
os.putenv("CLUSTER_IDENTITY_NAME", "cluster-identity")
258+
os.putenv("ASO_CREDENTIAL_SECRET_NAME", "aso-credentials")
258259

259260
os.putenv("AZURE_CLIENT_SECRET_B64", base64_encode(os.environ.get("AZURE_CLIENT_SECRET")))
260261
local("cat templates/azure-cluster-identity/secret.yaml | " + envsubst_cmd + " | " + kubectl_cmd + " apply -f -", quiet = True, echo_off = True)
262+
local("cat templates/flavors/aks-aso/credentials.yaml | " + envsubst_cmd + " | " + kubectl_cmd + " apply -f -", quiet = True, echo_off = True)
261263
os.unsetenv("AZURE_CLIENT_SECRET_B64")
262264

263265
def create_crs():

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ spec:
3939
type: object
4040
spec:
4141
description: AzureASOManagedClusterSpec defines the desired state of AzureASOManagedCluster.
42+
properties:
43+
resources:
44+
description: Resources are embedded ASO resources to be managed by
45+
this resource.
46+
items:
47+
type: object
48+
x-kubernetes-preserve-unknown-fields: true
49+
type: array
4250
type: object
4351
status:
4452
description: AzureASOManagedClusterStatus defines the observed state of

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ spec:
4848
spec:
4949
description: AzureASOManagedClusterTemplateResourceSpec defines
5050
the desired state of the templated resource.
51+
properties:
52+
resources:
53+
description: Resources are embedded ASO resources to be managed
54+
by this resource.
55+
items:
56+
type: object
57+
x-kubernetes-preserve-unknown-fields: true
58+
type: array
5159
type: object
5260
type: object
5361
required:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ spec:
4040
spec:
4141
description: AzureASOManagedControlPlaneSpec defines the desired state
4242
of AzureASOManagedControlPlane.
43+
properties:
44+
resources:
45+
description: Resources are embedded ASO resources to be managed by
46+
this resource.
47+
items:
48+
type: object
49+
x-kubernetes-preserve-unknown-fields: true
50+
type: array
4351
type: object
4452
status:
4553
description: AzureASOManagedControlPlaneStatus defines the observed state

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ spec:
4848
spec:
4949
description: AzureASOManagedControlPlaneTemplateResourceSpec defines
5050
the desired state of the templated resource.
51+
properties:
52+
resources:
53+
description: Resources are embedded ASO resources to be managed
54+
by this resource.
55+
items:
56+
type: object
57+
x-kubernetes-preserve-unknown-fields: true
58+
type: array
5159
type: object
5260
type: object
5361
required:

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@ spec:
4040
spec:
4141
description: AzureASOManagedMachinePoolSpec defines the desired state
4242
of AzureASOManagedMachinePool.
43+
properties:
44+
resources:
45+
description: Resources are embedded ASO resources to be managed by
46+
this resource.
47+
items:
48+
type: object
49+
x-kubernetes-preserve-unknown-fields: true
50+
type: array
4351
type: object
4452
status:
4553
description: AzureASOManagedMachinePoolStatus defines the observed state

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ spec:
4848
spec:
4949
description: AzureASOManagedControlPlaneTemplateResourceSpec defines
5050
the desired state of the templated resource.
51+
properties:
52+
resources:
53+
description: Resources are embedded ASO resources to be managed
54+
by this resource.
55+
items:
56+
type: object
57+
x-kubernetes-preserve-unknown-fields: true
58+
type: array
5159
type: object
5260
type: object
5361
required:

‎exp/api/v1alpha1/azureasomanagedclustertemplate_types.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package v1alpha1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21+
"k8s.io/apimachinery/pkg/runtime"
2122
)
2223

2324
// AzureASOManagedClusterTemplateSpec defines the desired state of AzureASOManagedClusterTemplate.
@@ -32,6 +33,9 @@ type AzureASOManagedClusterTemplateResource struct {
3233

3334
// AzureASOManagedClusterTemplateResourceSpec defines the desired state of the templated resource.
3435
type AzureASOManagedClusterTemplateResourceSpec struct {
36+
// Resources are embedded ASO resources to be managed by this resource.
37+
//+optional
38+
Resources []runtime.RawExtension `json:"resources,omitempty"`
3539
}
3640

3741
//+kubebuilder:object:root=true

‎exp/api/v1alpha1/azureasomanagedcontrolplanetemplate_types.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package v1alpha1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21+
"k8s.io/apimachinery/pkg/runtime"
2122
)
2223

2324
// AzureASOManagedControlPlaneTemplateSpec defines the desired state of AzureASOManagedControlPlane.
@@ -32,6 +33,9 @@ type AzureASOManagedControlPlaneResource struct {
3233

3334
// AzureASOManagedControlPlaneTemplateResourceSpec defines the desired state of the templated resource.
3435
type AzureASOManagedControlPlaneTemplateResourceSpec struct {
36+
// Resources are embedded ASO resources to be managed by this resource.
37+
//+optional
38+
Resources []runtime.RawExtension `json:"resources,omitempty"`
3539
}
3640

3741
//+kubebuilder:object:root=true

‎exp/api/v1alpha1/azureasomanagedmachinepooltemplate_types.go‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ package v1alpha1
1818

1919
import (
2020
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
21+
"k8s.io/apimachinery/pkg/runtime"
2122
)
2223

2324
// AzureASOManagedMachinePoolTemplateSpec defines the desired state of AzureASOManagedMachinePoolTemplate.
@@ -32,6 +33,9 @@ type AzureASOManagedMachinePoolResource struct {
3233

3334
// AzureASOManagedMachinePoolTemplateResourceSpec defines the desired state of the templated resource.
3435
type AzureASOManagedMachinePoolTemplateResourceSpec struct {
36+
// Resources are embedded ASO resources to be managed by this resource.
37+
//+optional
38+
Resources []runtime.RawExtension `json:"resources,omitempty"`
3539
}
3640

3741
//+kubebuilder:object:root=true

0 commit comments

Comments
 (0)