From 97eb35342db6fd7ef3fce3aec589d1585816a2ed Mon Sep 17 00:00:00 2001 From: Steve Kuznetsov Date: Mon, 15 Aug 2022 11:00:22 -0600 Subject: [PATCH] virtual/syncer: only handle the kubernetes export Signed-off-by: Steve Kuznetsov --- .../apireconciler/syncer_apireconciler_controller.go | 2 +- .../apireconciler/syncer_apireconciler_reconcile.go | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_controller.go b/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_controller.go index 6195db4f9d47..0825c5cea124 100644 --- a/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_controller.go +++ b/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_controller.go @@ -23,9 +23,9 @@ import ( "time" "github.com/kcp-dev/logicalcluster/v2" - "k8s.io/apimachinery/pkg/runtime/schema" apierrors "k8s.io/apimachinery/pkg/api/errors" + "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/util/errors" "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" diff --git a/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_reconcile.go b/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_reconcile.go index 84ab4926f9b6..9f62e0251364 100644 --- a/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_reconcile.go +++ b/pkg/virtual/syncer/controllers/apireconciler/syncer_apireconciler_reconcile.go @@ -35,6 +35,7 @@ import ( generatedopenapi "k8s.io/kubernetes/pkg/generated/openapi" apisv1alpha1 "github.com/kcp-dev/kcp/pkg/apis/apis/v1alpha1" + "github.com/kcp-dev/kcp/pkg/reconciler/workload/apiexport" "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/apidefinition" dynamiccontext "github.com/kcp-dev/kcp/pkg/virtual/framework/dynamic/context" "github.com/kcp-dev/kcp/pkg/virtual/framework/internalapis" @@ -61,6 +62,11 @@ func (c *APIReconciler) reconcile(ctx context.Context, apiExport *apisv1alpha1.A return nil } + if apiExport.ObjectMeta.Name != apiexport.TemporaryComputeServiceExportName { + // this is not something we're handling in this controller + return nil + } + c.mutex.RLock() oldSet := c.apiSets[apiDomainKey] c.mutex.RUnlock()