Update resourece interpreter pkg/file name and variable/parameter/com…

…ment naming

Signed-off-by: changzhen <[email protected]>

artifacts/deploy/webhook-configuration.yaml

@@ -116,10 +116,10 @@ webhooks:
       - operations: ["CREATE", "UPDATE"]
         apiGroups: ["config.karmada.io"]
         apiVersions: ["*"]
-        resources: ["resourceexploringwebhookconfigurations"]
+        resources: ["resourceinterpreterwebhookconfigurations"]
         scope: "Cluster"
     clientConfig:
-      url: https://karmada-webhook.karmada-system.svc:443/validate-resourceexploringwebhookconfiguration
+      url: https://karmada-webhook.karmada-system.svc:443/validate-resourceinterpreterwebhookconfiguration
       caBundle: {{caBundle}}
     failurePolicy: Fail
     sideEffects: None

charts/_crds/bases/config.karmada.io_resourceinterpreterwebhookconfigurations.yaml

@@ -100,8 +100,8 @@ spec:
                         and query parameters (\"?...\") are not allowed, either."
                       type: string
                   type: object
-                exploreReviewVersions:
-                  description: ExploreReviewVersions is an ordered list of preferred
+                interpreterContextVersions:
+                  description: InterpreterContextVersions is an ordered list of preferred
                     `ResourceInterpreterContext` versions the Webhook expects. Karmada
                     will try to use first version in the list which it supports. If
                     none of the versions specified in this list supported by Karmada,
@@ -112,11 +112,6 @@ spec:
                   items:
                     type: string
                   type: array
-                failurePolicy:
-                  description: FailurePolicy defines how unrecognized errors from
-                    the webhook are handled, allowed values are Ignore or Fail. Defaults
-                    to Fail.
-                  type: string
                 name:
                   description: Name is the full-qualified name of the webhook.
                   type: string
@@ -180,7 +175,7 @@ spec:
                   type: integer
               required:
               - clientConfig
-              - exploreReviewVersions
+              - interpreterContextVersions
               - name
               type: object
             type: array

charts/_crds/kustomization.yaml

@@ -10,7 +10,7 @@ resources:
 - bases/work.karmada.io_resourcebindings.yaml
 - bases/work.karmada.io_clusterresourcebindings.yaml
 - bases/work.karmada.io_works.yaml
-- bases/config.karmada.io_resourceexploringwebhookconfigurations.yaml
+- bases/config.karmada.io_resourceinterpreterwebhookconfigurations.yaml
 
 patchesStrategicMerge:
 - patches/webhook_in_resourcebindings.yaml

charts/templates/_karmada_webhook_configuration.tpl

@@ -120,10 +120,10 @@ webhooks:
       - operations: ["CREATE", "UPDATE"]
         apiGroups: ["config.karmada.io"]
         apiVersions: ["*"]
-        resources: ["resourceexploringwebhookconfigurations"]
+        resources: ["resourceinterpreterwebhookconfigurations"]
         scope: "Cluster"
     clientConfig:
-      url: https://{{ $name }}-webhook.{{ $namespace }}.svc:443/validate-resourceexploringwebhookconfiguration
+      url: https://{{ $name }}-webhook.{{ $namespace }}.svc:443/validate-resourceinterpreterwebhookconfiguration
       {{- include "karmada.webhook.caBundle" . | nindent 6 }}
     failurePolicy: Fail
     sideEffects: None

cmd/agent/app/agent.go

@@ -20,8 +20,8 @@ import (
 	"github.com/karmada-io/karmada/pkg/controllers/execution"
 	"github.com/karmada-io/karmada/pkg/controllers/mcs"
 	"github.com/karmada-io/karmada/pkg/controllers/status"
-	"github.com/karmada-io/karmada/pkg/crdexplorer"
 	"github.com/karmada-io/karmada/pkg/karmadactl"
+	"github.com/karmada-io/karmada/pkg/resourceinterpreter"
 	"github.com/karmada-io/karmada/pkg/util"
 	"github.com/karmada-io/karmada/pkg/util/gclient"
 	"github.com/karmada-io/karmada/pkg/util/helper"
@@ -131,12 +131,12 @@ func setupControllers(mgr controllerruntime.Manager, opts *options.Options, stop
 	restConfig := mgr.GetConfig()
 	dynamicClientSet := dynamic.NewForConfigOrDie(restConfig)
 	controlPlaneInformerManager := informermanager.NewSingleClusterInformerManager(dynamicClientSet, 0, stopChan)
-	crdExplorer := crdexplorer.NewCustomResourceExplorer("", controlPlaneInformerManager)
-	if err := mgr.Add(crdExplorer); err != nil {
-		klog.Fatalf("Failed to setup custom resource explorer: %v", err)
+	resourceInterpreter := resourceinterpreter.NewResourceInterpreter("", controlPlaneInformerManager)
+	if err := mgr.Add(resourceInterpreter); err != nil {
+		klog.Fatalf("Failed to setup custom resource interpreter: %v", err)
 	}
 
-	objectWatcher := objectwatcher.NewObjectWatcher(mgr.GetClient(), mgr.GetRESTMapper(), util.NewClusterDynamicClientSetForAgent, crdExplorer)
+	objectWatcher := objectwatcher.NewObjectWatcher(mgr.GetClient(), mgr.GetRESTMapper(), util.NewClusterDynamicClientSetForAgent, resourceInterpreter)
 	executionController := &execution.Controller{
 		Client:          mgr.GetClient(),
 		EventRecorder:   mgr.GetEventRecorderFor(execution.ControllerName),

cmd/controller-manager/app/controllermanager.go

@@ -27,9 +27,9 @@ import (
 	"github.com/karmada-io/karmada/pkg/controllers/mcs"
 	"github.com/karmada-io/karmada/pkg/controllers/namespace"
 	"github.com/karmada-io/karmada/pkg/controllers/status"
-	"github.com/karmada-io/karmada/pkg/crdexplorer"
 	"github.com/karmada-io/karmada/pkg/detector"
 	"github.com/karmada-io/karmada/pkg/karmadactl"
+	"github.com/karmada-io/karmada/pkg/resourceinterpreter"
 	"github.com/karmada-io/karmada/pkg/util"
 	"github.com/karmada-io/karmada/pkg/util/gclient"
 	"github.com/karmada-io/karmada/pkg/util/helper"
@@ -124,12 +124,12 @@ func setupControllers(mgr controllerruntime.Manager, opts *options.Options, stop
 
 	controlPlaneInformerManager := informermanager.NewSingleClusterInformerManager(dynamicClientSet, 0, stopChan)
 
-	crdExplorer := crdexplorer.NewCustomResourceExplorer("", controlPlaneInformerManager)
-	if err := mgr.Add(crdExplorer); err != nil {
-		klog.Fatalf("Failed to setup custom resource explorer: %v", err)
+	resourceInterpreter := resourceinterpreter.NewResourceInterpreter("", controlPlaneInformerManager)
+	if err := mgr.Add(resourceInterpreter); err != nil {
+		klog.Fatalf("Failed to setup custom resource interpreter: %v", err)
 	}
 
-	objectWatcher := objectwatcher.NewObjectWatcher(mgr.GetClient(), mgr.GetRESTMapper(), util.NewClusterDynamicClientSet, crdExplorer)
+	objectWatcher := objectwatcher.NewObjectWatcher(mgr.GetClient(), mgr.GetRESTMapper(), util.NewClusterDynamicClientSet, resourceInterpreter)
 
 	resourceDetector := &detector.ResourceDetector{
 		DiscoveryClientSet:           discoverClientSet,
@@ -139,7 +139,7 @@ func setupControllers(mgr controllerruntime.Manager, opts *options.Options, stop
 		DynamicClient:                dynamicClientSet,
 		SkippedResourceConfig:        skippedResourceConfig,
 		SkippedPropagatingNamespaces: skippedPropagatingNamespaces,
-		ResourceExplorer:             crdExplorer,
+		ResourceInterpreter:          resourceInterpreter,
 	}
 	if err := mgr.Add(resourceDetector); err != nil {
 		klog.Fatalf("Failed to setup resource detector: %v", err)

cmd/webhook/app/webhook.go

@@ -20,7 +20,7 @@ import (
 	"github.com/karmada-io/karmada/pkg/version/sharedcommand"
 	"github.com/karmada-io/karmada/pkg/webhook/cluster"
 	"github.com/karmada-io/karmada/pkg/webhook/clusterpropagationpolicy"
-	"github.com/karmada-io/karmada/pkg/webhook/crdexplorer"
+	"github.com/karmada-io/karmada/pkg/webhook/configuration"
 	"github.com/karmada-io/karmada/pkg/webhook/overridepolicy"
 	"github.com/karmada-io/karmada/pkg/webhook/propagationpolicy"
 	"github.com/karmada-io/karmada/pkg/webhook/work"
@@ -79,7 +79,7 @@ func Run(ctx context.Context, opts *options.Options) error {
 	hookServer.Register("/mutate-overridepolicy", &webhook.Admission{Handler: &overridepolicy.MutatingAdmission{}})
 	hookServer.Register("/mutate-work", &webhook.Admission{Handler: &work.MutatingAdmission{}})
 	hookServer.Register("/convert", &conversion.Webhook{})
-	hookServer.Register("/validate-resourceexploringwebhookconfiguration", &webhook.Admission{Handler: &crdexplorer.ValidatingAdmission{}})
+	hookServer.Register("/validate-resourceinterpreterwebhookconfiguration", &webhook.Admission{Handler: &configuration.ValidatingAdmission{}})
 	hookServer.WebhookMux.Handle("/readyz/", http.StripPrefix("/readyz/", &healthz.Handler{}))
 
 	// blocks until the context is done.

examples/README.md

@@ -1,4 +1,4 @@
 # Examples
 
-### Custom Resource Explorer
-This example implements a new CustomResourceDefinition(CRD), `Workload`, and creates a custom resource explorer webhook.
+### Resource Interpreter
+This example implements a new CustomResourceDefinition(CRD), `Workload`, and creates a resource interpreter webhook.

hack/update-codegen.sh

@@ -40,8 +40,8 @@ deepcopy-gen \
   --output-file-base=zz_generated.deepcopy
 deepcopy-gen \
   --go-header-file hack/boilerplate/boilerplate.go.txt \
-  --input-dirs=github.com/karmada-io/karmada/examples/customresourceexplorer/apis/workload/v1alpha1 \
-  --output-package=github.com/karmada-io/karmada/examples/customresourceexplorer/apis/workload/v1alpha1 \
+  --input-dirs=github.com/karmada-io/karmada/examples/customresourceinterpreter/apis/workload/v1alpha1 \
+  --output-package=github.com/karmada-io/karmada/examples/customresourceinterpreter/apis/workload/v1alpha1 \
   --output-file-base=zz_generated.deepcopy
 
 echo "Generating with register-gen"
@@ -73,8 +73,8 @@ register-gen \
   --output-file-base=zz_generated.register
 register-gen \
   --go-header-file hack/boilerplate/boilerplate.go.txt \
-  --input-dirs=github.com/karmada-io/karmada/examples/customresourceexplorer/apis/workload/v1alpha1 \
-  --output-package=github.com/karmada-io/karmada/examples/customresourceexplorer/apis/workload/v1alpha1 \
+  --input-dirs=github.com/karmada-io/karmada/examples/customresourceinterpreter/apis/workload/v1alpha1 \
+  --output-package=github.com/karmada-io/karmada/examples/customresourceinterpreter/apis/workload/v1alpha1 \
   --output-file-base=zz_generated.register
 
 echo "Generating with client-gen"

hack/update-crdgen.sh

@@ -14,4 +14,4 @@ util::install_tools ${CONTROLLER_GEN_PKG} ${CONTROLLER_GEN_VER} >/dev/null 2>&1
 
 # Unify the crds used by helm chart and the installation scripts
 controller-gen crd paths=./pkg/apis/... output:crd:dir=./charts/_crds/bases
-controller-gen crd paths=./examples/customresourceexplorer/apis/... output:crd:dir=./examples/customresourceexplorer/apis/
+controller-gen crd paths=./examples/customresourceinterpreter/apis/... output:crd:dir=./examples/customresourceinterpreter/apis/

pkg/apis/config/v1alpha1/interpretercontext_types.go

@@ -11,20 +11,20 @@ import (
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// ResourceInterpreterContext describes an explore review request and response.
+// ResourceInterpreterContext describes an interpreter context request and response.
 type ResourceInterpreterContext struct {
 	metav1.TypeMeta `json:",inline"`
 
-	// Request describes the attributes for the explore request.
+	// Request describes the attributes for the interpreter request.
 	// +optional
 	Request *ResourceInterpreterRequest `json:"request,omitempty"`
 
-	// Response describes the attributes for the explore response.
+	// Response describes the attributes for the interpreter response.
 	// +optional
 	Response *ResourceInterpreterResponse `json:"response,omitempty"`
 }
 
-// ResourceInterpreterRequest describes the explore.Attributes for the explore request.
+// ResourceInterpreterRequest describes the interpreter.Attributes for the interpreter request.
 type ResourceInterpreterRequest struct {
 	// UID is an identifier for the individual request/response.
 	// The UID is meant to track the round trip (request/response) between the karmada and the WebHook, not the user request.
@@ -53,7 +53,7 @@ type ResourceInterpreterRequest struct {
 	Object runtime.RawExtension `json:"object,omitempty"`
 
 	// ObservedObject is the object observed from the kube-apiserver of member clusters.
-	// Not nil only when InterpreterOperation is InterpreterOperationRetention.
+	// Not nil only when InterpreterOperation is InterpreterOperationRetain.
 	// +optional
 	ObservedObject *runtime.RawExtension `json:"observedObject,omitempty"`
 
@@ -67,7 +67,7 @@ type ResourceInterpreterRequest struct {
 	AggregatedStatus []workv1alpha1.AggregatedStatusItem `json:"aggregatedStatus,omitempty"`
 }
 
-// ResourceInterpreterResponse describes an explore response.
+// ResourceInterpreterResponse describes an interpreter response.
 type ResourceInterpreterResponse struct {
 	// UID is an identifier for the individual request/response.
 	// This must be copied over from the corresponding ResourceInterpreterRequest.

pkg/apis/config/v1alpha1/resourceinterpreterwebhook_types.go

@@ -37,11 +37,6 @@ type ResourceInterpreterWebhook struct {
 	// +optional
 	Rules []RuleWithOperations `json:"rules,omitempty"`
 
-	// FailurePolicy defines how unrecognized errors from the webhook are handled,
-	// allowed values are Ignore or Fail. Defaults to Fail.
-	// +optional
-	FailurePolicy *admissionregistrationv1.FailurePolicyType `json:"failurePolicy,omitempty"`
-
 	// TimeoutSeconds specifies the timeout for this webhook. After the timeout passes,
 	// the webhook call will be ignored or the API call will fail based on the
 	// failure policy.
@@ -50,14 +45,14 @@ type ResourceInterpreterWebhook struct {
 	// +optional
 	TimeoutSeconds *int32 `json:"timeoutSeconds,omitempty"`
 
-	// ExploreReviewVersions is an ordered list of preferred `ResourceInterpreterContext`
+	// InterpreterContextVersions is an ordered list of preferred `ResourceInterpreterContext`
 	// versions the Webhook expects. Karmada will try to use first version in
 	// the list which it supports. If none of the versions specified in this list
 	// supported by Karmada, validation will fail for this object.
 	// If a persisted webhook configuration specifies allowed versions and does not
 	// include any versions known to the Karmada, calls to the webhook will fail
 	// and be subject to the failure policy.
-	ExploreReviewVersions []string `json:"exploreReviewVersions"`
+	InterpreterContextVersions []string `json:"interpreterContextVersions"`
 }
 
 // RuleWithOperations is a tuple of Operations and Resources. It is recommended to make
@@ -94,9 +89,9 @@ const (
 	// InterpreterOperationPrune indicates that karmada want to figure out how to package resource template to Work.
 	InterpreterOperationPrune InterpreterOperation = "Prune"
 
-	// InterpreterOperationRetention indicates that karmada request webhook to retain the desired resource template.
+	// InterpreterOperationRetain indicates that karmada request webhook to retain the desired resource template.
 	// Only necessary for those resources which specification will be updated by their controllers running in member cluster.
-	InterpreterOperationRetention InterpreterOperation = "Retention"
+	InterpreterOperationRetain InterpreterOperation = "Retain"
 
 	// InterpreterOperationAggregateStatus indicates that karmada want to figure out how to aggregate status to resource template.
 	// Only necessary for those resource types that want to aggregate status to resource template.