diff --git a/VERSION b/VERSION index 26aaba0e..6085e946 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.0 +1.2.1 diff --git a/deployment/charts/intel-infra-provider-crds/Chart.yaml b/deployment/charts/intel-infra-provider-crds/Chart.yaml index 13cad1eb..156f497e 100644 --- a/deployment/charts/intel-infra-provider-crds/Chart.yaml +++ b/deployment/charts/intel-infra-provider-crds/Chart.yaml @@ -5,8 +5,8 @@ apiVersion: v2 name: intel-infra-provider-crds description: Custom Resource Definitions for Intel Cluster API Provider type: application -version: 1.2.0 -appVersion: 1.2.0 +version: 1.2.1 +appVersion: 1.2.1 annotations: - revision: cec78684af2dd2146c033e7b65575d44fc189d96 - created: "2025-05-23T21:37:06Z" + revision: 8308afe4834a6b704b0419db05885d2e1f05f69e + created: "2025-06-10T14:20:39Z" diff --git a/deployment/charts/intel-infra-provider/Chart.yaml b/deployment/charts/intel-infra-provider/Chart.yaml index 31141e77..e00de78d 100644 --- a/deployment/charts/intel-infra-provider/Chart.yaml +++ b/deployment/charts/intel-infra-provider/Chart.yaml @@ -5,8 +5,8 @@ apiVersion: v2 name: intel-infra-provider description: The Intel Cluster API Provider type: application -version: 1.2.0 -appVersion: 1.2.0 +version: 1.2.1 +appVersion: 1.2.1 annotations: - revision: cec78684af2dd2146c033e7b65575d44fc189d96 - created: "2025-05-23T21:37:06Z" + revision: 8308afe4834a6b704b0419db05885d2e1f05f69e + created: "2025-06-10T14:20:39Z" diff --git a/go.mod b/go.mod index 973968d7..161aac5b 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,7 @@ require ( github.com/oapi-codegen/echo-middleware v1.0.1 github.com/onsi/ginkgo/v2 v2.22.2 github.com/onsi/gomega v1.36.2 - github.com/open-edge-platform/cluster-connect-gateway v1.1.3-0.20250605083335-2db568703c54 + github.com/open-edge-platform/cluster-connect-gateway v1.2.0 github.com/open-edge-platform/infra-core/inventory/v2 v2.23.0 github.com/open-edge-platform/orch-library/go v0.5.29 github.com/open-policy-agent/opa v1.4.0 @@ -78,7 +78,6 @@ require ( github.com/hashicorp/go-sockaddr v1.0.7 // indirect github.com/hashicorp/hcl v1.0.0 // indirect github.com/hashicorp/hcl/v2 v2.23.0 // indirect - github.com/iancoleman/strcase v0.3.0 // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/klauspost/compress v1.18.0 // indirect github.com/labstack/echo-contrib v0.17.3 // indirect @@ -89,7 +88,6 @@ require ( github.com/lestrrat-go/iter v1.0.2 // indirect github.com/lestrrat-go/option v1.0.1 // indirect github.com/lib/pq v1.10.9 // indirect - github.com/lyft/protoc-gen-star/v2 v2.0.4-0.20230330145011-496ad1ac90a4 // indirect github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mennanov/fmutils v0.3.0 // indirect @@ -107,7 +105,6 @@ require ( github.com/ryanuber/go-glob v1.0.0 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/sirupsen/logrus v1.9.3 // indirect - github.com/spf13/afero v1.12.0 // indirect github.com/spf13/cobra v1.9.1 // indirect github.com/stretchr/objx v0.5.2 // indirect github.com/tchap/go-patricia/v2 v2.3.2 // indirect diff --git a/go.sum b/go.sum index c63a5275..edde9fbc 100644 --- a/go.sum +++ b/go.sum @@ -1036,8 +1036,6 @@ github.com/lucas-clemente/aes12 v0.0.0-20171027163421-cd47fb39b79f/go.mod h1:JpH github.com/lucas-clemente/quic-clients v0.1.0/go.mod h1:y5xVIEoObKqULIKivu+gD/LU90pL73bTdtQjPBvtCBk= github.com/lucas-clemente/quic-go v0.10.2/go.mod h1:hvaRS9IHjFLMq76puFJeWNfmn+H70QZ/CXoxqw9bzao= github.com/lucas-clemente/quic-go-certificates v0.0.0-20160823095156-d2f86524cced/go.mod h1:NCcRLrOTZbzhZvixZLlERbJtDtYsmMw8Jc4vS8Z0g58= -github.com/lyft/protoc-gen-star/v2 v2.0.4-0.20230330145011-496ad1ac90a4 h1:sIXJOMrYnQZJu7OB7ANSF4MYri2fTEGIsRLz6LwI4xE= -github.com/lyft/protoc-gen-star/v2 v2.0.4-0.20230330145011-496ad1ac90a4/go.mod h1:amey7yeodaJhXSbf/TlLvWiqQfLOSpEk//mLlc+axEk= github.com/lyft/protoc-gen-validate v0.0.13/go.mod h1:XbGvPuh87YZc5TdIa2/I4pLk0QoUACkjt2znoq26NVQ= github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= @@ -1157,14 +1155,8 @@ github.com/onsi/gomega v1.12.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je4 github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8= github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= -github.com/open-edge-platform/cluster-connect-gateway v1.0.5 h1:4/F0Sgne0Lv42pB/uxgTrb6tCDvJVI8gB9SZ8/U+jfg= -github.com/open-edge-platform/cluster-connect-gateway v1.0.5/go.mod h1:EO8QC9qE9hm9OvFiqQ4wl4PCuDmtf0eX1Urw2RLKxvE= -github.com/open-edge-platform/cluster-connect-gateway v1.1.2 h1:DQOl5P7raXBRzgmIgbjfe3Ex81Sx/CF6tWEd5JctTAg= -github.com/open-edge-platform/cluster-connect-gateway v1.1.2/go.mod h1:UChNdPqK997iA3/rbiw9fNjGmu+d47nm918UC8TcHpc= -github.com/open-edge-platform/cluster-connect-gateway v1.1.3-0.20250528123101-b095ce1bf74f h1:/fybIuS+/GBmxxPnzk1/2FbSvTkS9y8oVN8+RF+r/84= -github.com/open-edge-platform/cluster-connect-gateway v1.1.3-0.20250528123101-b095ce1bf74f/go.mod h1:UChNdPqK997iA3/rbiw9fNjGmu+d47nm918UC8TcHpc= -github.com/open-edge-platform/cluster-connect-gateway v1.1.3-0.20250605083335-2db568703c54 h1:2WUINhCSrn1f2xtLI1eiii5mmMcoVv/w7wyT5ZLuWJM= -github.com/open-edge-platform/cluster-connect-gateway v1.1.3-0.20250605083335-2db568703c54/go.mod h1:c9izjEQvS24B66Sh9MfkKTe5UlEPSxkvPw4pGyjRbRo= +github.com/open-edge-platform/cluster-connect-gateway v1.2.0 h1:F85JXUqkRbfaNAvOADbULMHVWcM7MeUCzmqXQE1urlk= +github.com/open-edge-platform/cluster-connect-gateway v1.2.0/go.mod h1:c9izjEQvS24B66Sh9MfkKTe5UlEPSxkvPw4pGyjRbRo= github.com/open-edge-platform/infra-core/inventory/v2 v2.23.0 h1:fq25w9Ky6gvE5pTtqf/N9DLrfvZRnIzAJB+VzsiFSnA= github.com/open-edge-platform/infra-core/inventory/v2 v2.23.0/go.mod h1:mpGYnChj0Z5SNYMy8IpuQ76OVcAmKfO384J7ZI5zxFE= github.com/open-edge-platform/orch-library/go v0.5.29 h1:LfOaRcRYXpQdcyHrVwN4wC2l11wbdUnBLkc2P7vrZNY= @@ -1287,8 +1279,6 @@ github.com/sony/gobreaker v0.4.1/go.mod h1:ZKptC7FHNvhBz7dN2LGjPVBz2sZJmc0/PkyDJ github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= -github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs= -github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y= github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo= diff --git a/internal/controller/intelcluster_controller.go b/internal/controller/intelcluster_controller.go index ef5aa1e1..cc7d1263 100644 --- a/internal/controller/intelcluster_controller.go +++ b/internal/controller/intelcluster_controller.go @@ -278,6 +278,10 @@ func (r *IntelClusterReconciler) reconcileClusterConnectConnection(scope *scope. // get the connection probe condition from the clusterconnect resource ccConditions := clusterConnect.GetConditions() connectionProbeCondition := meta.FindStatusCondition(ccConditions, ccgv1.ConnectionProbeCondition) + if connectionProbeCondition == nil { + scope.Log.Info("connection probe condition not found in clusterconnect resource") + return true + } switch connectionProbeCondition.Status { case metav1.ConditionTrue: @@ -290,6 +294,11 @@ func (r *IntelClusterReconciler) reconcileClusterConnectConnection(scope *scope. // will cause intelCluster reconcile and update the condition when the connection is alive case metav1.ConditionUnknown: scope.Log.Info("connection probe condition is unknown in clusterconnect resource") + if scope.Cluster.Status.ControlPlaneReady { + // if the Cluster's ControlPlane is provisioned and the ClusterConnect's condition is unknown, + // we can assume that the connection is not established yet, so we mark the IntelCluster condition as false + conditions.MarkFalse(intelCluster, infrav1.SecureTunnelEstablishedCondition, infrav1.SecureTunnelUnknownReason, clusterv1.ConditionSeverityWarning, "No connection to cluster, waiting for connection probe condition to be true") + } } return false