-
Notifications
You must be signed in to change notification settings - Fork 431
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.
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
move ASOAPI out of experimental #4969
Conversation
@@ -211,20 +211,18 @@ webhooks: | |||
service: | |||
name: webhook-service | |||
namespace: system | |||
path: /validate-infrastructure-cluster-x-k8s-io-v1beta1-azurecluster |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Locally, git tells me the diff here is just that some of the webhooks
got reordered with no other changes:
diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml
index ef0911274..de5ab8e64 100644
--- a/config/webhook/manifests.yaml
+++ b/config/webhook/manifests.yaml
@@ -204,6 +204,66 @@ kind: ValidatingWebhookConfiguration
metadata:
name: validating-webhook-configuration
webhooks:
+- admissionReviewVersions:
+ - v1
+ - v1beta1
+ clientConfig:
+ service:
+ name: webhook-service
+ namespace: system
+ path: /validate-infrastructure-cluster-x-k8s-io-v1alpha1-azureasomanagedcluster
+ failurePolicy: Fail
+ name: validation.azureasomanagedcluster.infrastructure.cluster.x-k8s.io
+ rules:
+ - apiGroups:
+ - infrastructure.cluster.x-k8s.io
+ apiVersions:
+ - v1alpha1
+ operations:
+ - CREATE
+ resources:
+ - azureasomanagedclusters
+ sideEffects: None
+- admissionReviewVersions:
+ - v1
+ - v1beta1
+ clientConfig:
+ service:
+ name: webhook-service
+ namespace: system
+ path: /validate-infrastructure-cluster-x-k8s-io-v1alpha1-azureasomanagedcontrolplane
+ failurePolicy: Fail
+ name: validation.azureasomanagedcontrolplane.infrastructure.cluster.x-k8s.io
+ rules:
+ - apiGroups:
+ - infrastructure.cluster.x-k8s.io
+ apiVersions:
+ - v1alpha1
+ operations:
+ - CREATE
+ resources:
+ - azureasomanagedcontrolplanes
+ sideEffects: None
+- admissionReviewVersions:
+ - v1
+ - v1beta1
+ clientConfig:
+ service:
+ name: webhook-service
+ namespace: system
+ path: /validate-infrastructure-cluster-x-k8s-io-v1alpha1-azureasomanagedmachinepool
+ failurePolicy: Fail
+ name: validation.azureasomanagedmachinepool.infrastructure.cluster.x-k8s.io
+ rules:
+ - apiGroups:
+ - infrastructure.cluster.x-k8s.io
+ apiVersions:
+ - v1alpha1
+ operations:
+ - CREATE
+ resources:
+ - azureasomanagedmachinepools
+ sideEffects: None
- admissionReviewVersions:
- v1
- v1beta1
@@ -442,66 +502,6 @@ webhooks:
resources:
- azuremanagedmachinepooltemplates
sideEffects: None
-- admissionReviewVersions:
- - v1
- - v1beta1
- clientConfig:
- service:
- name: webhook-service
- namespace: system
- path: /validate-infrastructure-cluster-x-k8s-io-v1alpha1-azureasomanagedcluster
- failurePolicy: Fail
- name: validation.azureasomanagedcluster.infrastructure.cluster.x-k8s.io
- rules:
- - apiGroups:
- - infrastructure.cluster.x-k8s.io
- apiVersions:
- - v1alpha1
- operations:
- - CREATE
- resources:
- - azureasomanagedclusters
- sideEffects: None
-- admissionReviewVersions:
- - v1
- - v1beta1
- clientConfig:
- service:
- name: webhook-service
- namespace: system
- path: /validate-infrastructure-cluster-x-k8s-io-v1alpha1-azureasomanagedcontrolplane
- failurePolicy: Fail
- name: validation.azureasomanagedcontrolplane.infrastructure.cluster.x-k8s.io
- rules:
- - apiGroups:
- - infrastructure.cluster.x-k8s.io
- apiVersions:
- - v1alpha1
- operations:
- - CREATE
- resources:
- - azureasomanagedcontrolplanes
- sideEffects: None
-- admissionReviewVersions:
- - v1
- - v1beta1
- clientConfig:
- service:
- name: webhook-service
- namespace: system
- path: /validate-infrastructure-cluster-x-k8s-io-v1alpha1-azureasomanagedmachinepool
- failurePolicy: Fail
- name: validation.azureasomanagedmachinepool.infrastructure.cluster.x-k8s.io
- rules:
- - apiGroups:
- - infrastructure.cluster.x-k8s.io
- apiVersions:
- - v1alpha1
- operations:
- - CREATE
- resources:
- - azureasomanagedmachinepools
- sideEffects: None
- admissionReviewVersions:
- v1
- v1beta1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is the controller that does the automatic adoption of AKS clusters into the ASO API which hasn't been tested as thoroughly yet as the actual API, so I could see where we might still want this under exp/
. Would we want to add a separate feature flag just for the adoption controllers that we leave off by default so we can still enable the rest of the ASO API by default?
/milestone v1.16 |
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #4969 +/- ##
==========================================
- Coverage 62.25% 62.24% -0.02%
==========================================
Files 201 201
Lines 16912 16912
==========================================
- Hits 10529 10527 -2
- Misses 5590 5592 +2
Partials 793 793 ☔ View full report in Codecov by Sentry. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
LGTM label has been added. Git tree hash: 946a2733d6fc6d9dfa8ef0870dbc9fe3e14abcdc
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just one comment, overall looks good to me.
/lgtm
@@ -29,8 +29,8 @@ import ( | |||
"k8s.io/apimachinery/pkg/runtime" | |||
"k8s.io/apimachinery/pkg/runtime/schema" | |||
"k8s.io/klog/v2" | |||
infrav1exp "sigs.k8s.io/cluster-api-provider-azure/exp/api/v1alpha1" | |||
"sigs.k8s.io/cluster-api-provider-azure/exp/mutators" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is mutators
also part of this graduation ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, that defines some supporting code for the rest of the ASOAPI things.
I didn't actually hit any conflicts? |
/test pull-cluster-api-provider-azure-e2e-aks |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
/approve
LGTM label has been added. Git tree hash: 2a8304dacfeb1a329caaf4a7a9ab18b83f643e30
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mboersma The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
squashed! |
@nojnhuh: The following tests failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
What type of PR is this?
/kind feature
What this PR does / why we need it:
This PR moves the functionality gated by the
ASOAPI
feature flag out ofexp/
and enables the flag by default. The APIs themselves are still v1alpha1.Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when PR gets merged):Fixes #
Special notes for your reviewer:
TODOs:
Release note: