Merge branch 'main' into asotwodoteight

# Conflicts: # go.mod
kubernetes-sigs · Jul 11, 2024 · 4e2f625 · 4e2f625
2 parents 67233e5 + a70fec1
commit 4e2f625
Show file tree

Hide file tree

Showing 59 changed files with 444 additions and 421 deletions.
diff --git a/Makefile b/Makefile
@@ -33,7 +33,7 @@ export GOPROXY
 export GO111MODULE=on
 
 # Kubebuilder.
-export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.29.0
+export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.30.0
 export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
 export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
 
@@ -101,7 +101,7 @@ RELEASE_NOTES_VER := v0.16.6-0.20240222112346-71feb57b59a4
 RELEASE_NOTES_BIN := release-notes
 RELEASE_NOTES := $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER)
 
-KPROMO_VER := v4.0.4
+KPROMO_VER := v4.0.5
 KPROMO_BIN := kpromo
 KPROMO := $(TOOLS_BIN_DIR)/$(KPROMO_BIN)-$(KPROMO_VER)
 
@@ -314,7 +314,7 @@ create-management-cluster: $(KUSTOMIZE) $(ENVSUBST) $(KUBECTL) $(KIND) ## Create
 	./hack/create-custom-cloud-provider-config.sh
 
 	# Deploy CAPI
-	timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.3/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
+	timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api/releases/download/v1.7.4/cluster-api-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"
 
 	# Deploy CAAPH
 	timeout --foreground 300 bash -c "until curl --retry $(CURL_RETRIES) -sSL https://github.com/kubernetes-sigs/cluster-api-addon-provider-helm/releases/download/v0.1.0-alpha.10/addon-components.yaml | $(ENVSUBST) | $(KUBECTL) apply -f -; do sleep 5; done"

diff --git a/Tiltfile b/Tiltfile
@@ -20,9 +20,9 @@ settings = {
     "deploy_cert_manager": True,
     "preload_images_for_kind": True,
     "kind_cluster_name": "capz",
-    "capi_version": "v1.7.3",
+    "capi_version": "v1.7.4",
     "caaph_version": "v0.2.1",
-    "cert_manager_version": "v1.15.0",
+    "cert_manager_version": "v1.15.1",
     "kubernetes_version": "v1.28.3",
     "aks_kubernetes_version": "v1.28.3",
     "flatcar_version": "3374.2.1",

diff --git a/.../v1alpha1/azureasomanagedcluster_types.go → api/v1alpha1/azureasomanagedcluster_types.go b/.../v1alpha1/azureasomanagedcluster_types.go → api/v1alpha1/azureasomanagedcluster_types.go
diff --git a/...1alpha1/azureasomanagedcluster_webhook.go → ...1alpha1/azureasomanagedcluster_webhook.go b/...1alpha1/azureasomanagedcluster_webhook.go → ...1alpha1/azureasomanagedcluster_webhook.go
diff --git a/...1/azureasomanagedclustertemplate_types.go → ...1/azureasomanagedclustertemplate_types.go b/...1/azureasomanagedclustertemplate_types.go → ...1/azureasomanagedclustertemplate_types.go
diff --git a/...pha1/azureasomanagedcontrolplane_types.go → ...pha1/azureasomanagedcontrolplane_types.go b/...pha1/azureasomanagedcontrolplane_types.go → ...pha1/azureasomanagedcontrolplane_types.go
diff --git a/...a1/azureasomanagedcontrolplane_webhook.go → ...a1/azureasomanagedcontrolplane_webhook.go b/...a1/azureasomanagedcontrolplane_webhook.go → ...a1/azureasomanagedcontrolplane_webhook.go
diff --git a/...reasomanagedcontrolplanetemplate_types.go → ...reasomanagedcontrolplanetemplate_types.go b/...reasomanagedcontrolplanetemplate_types.go → ...reasomanagedcontrolplanetemplate_types.go
diff --git a/...lpha1/azureasomanagedmachinepool_types.go → ...lpha1/azureasomanagedmachinepool_types.go b/...lpha1/azureasomanagedmachinepool_types.go → ...lpha1/azureasomanagedmachinepool_types.go
diff --git a/...ha1/azureasomanagedmachinepool_webhook.go → ...ha1/azureasomanagedmachinepool_webhook.go b/...ha1/azureasomanagedmachinepool_webhook.go → ...ha1/azureasomanagedmachinepool_webhook.go
diff --git a/...ureasomanagedmachinepooltemplate_types.go → ...ureasomanagedmachinepooltemplate_types.go b/...ureasomanagedmachinepooltemplate_types.go → ...ureasomanagedmachinepooltemplate_types.go
diff --git a/exp/api/v1alpha1/doc.go → api/v1alpha1/doc.go b/exp/api/v1alpha1/doc.go → api/v1alpha1/doc.go
diff --git a/exp/api/v1alpha1/groupversion_info.go → api/v1alpha1/groupversion_info.go b/exp/api/v1alpha1/groupversion_info.go → api/v1alpha1/groupversion_info.go
diff --git a/exp/api/v1alpha1/zz_generated.deepcopy.go → api/v1alpha1/zz_generated.deepcopy.go b/exp/api/v1alpha1/zz_generated.deepcopy.go → api/v1alpha1/zz_generated.deepcopy.go
diff --git a/azure/services/agentpools/agentpools_test.go b/azure/services/agentpools/agentpools_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"testing"
 
-	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20230202preview"
 	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
+	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
 	. "github.com/onsi/gomega"
 	"github.com/pkg/errors"
 	"go.uber.org/mock/gomock"

diff --git a/azure/services/agentpools/spec.go b/azure/services/agentpools/spec.go
@@ -19,9 +19,9 @@ package agentpools
 import (
 	"context"
 
-	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20230202preview"
 	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
 	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
+	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/azure/services/agentpools/spec_test.go b/azure/services/agentpools/spec_test.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"testing"
 
-	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20230202preview"
 	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
+	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/gomega"

diff --git a/azure/services/managedclusters/managedclusters_test.go b/azure/services/managedclusters/managedclusters_test.go
@@ -21,8 +21,8 @@ import (
 	"errors"
 	"testing"
 
-	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20230202preview"
 	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
+	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
 	. "github.com/onsi/gomega"
 	"go.uber.org/mock/gomock"
 	corev1 "k8s.io/api/core/v1"

diff --git a/azure/services/managedclusters/spec.go b/azure/services/managedclusters/spec.go
@@ -22,9 +22,9 @@ import (
 	"fmt"
 	"net"
 
-	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20230202preview"
 	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
 	asocontainerservicev1hub "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001/storage"
+	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	"github.com/pkg/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

diff --git a/azure/services/managedclusters/spec_test.go b/azure/services/managedclusters/spec_test.go
@@ -21,8 +21,8 @@ import (
 	"encoding/base64"
 	"testing"
 
-	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20230202preview"
 	asocontainerservicev1 "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231001"
+	asocontainerservicev1preview "github.com/Azure/azure-service-operator/v2/api/containerservice/v1api20231102preview"
 	"github.com/Azure/azure-service-operator/v2/pkg/genruntime"
 	"github.com/google/go-cmp/cmp"
 	. "github.com/onsi/gomega"