diff --git a/Makefile b/Makefile index aa040f42..0aeecbcf 100644 --- a/Makefile +++ b/Makefile @@ -106,19 +106,19 @@ REGISTRY ?= docker.io/kubespheredev #CAPKK_IMAGE_NAME ?= capkk-controller #CAPKK_CONTROLLER_IMG ?= $(REGISTRY)/$(CAPKK_IMAGE_NAME) # controller-manager -OPERATOR_IMAGE_NAME ?= controller-manager +OPERATOR_IMAGE_NAME ?= kk-controller-manager OPERATOR_CONTROLLER_IMG ?= $(REGISTRY)/$(OPERATOR_IMAGE_NAME) # executor -EXECUTOR_IMAGE_NAME ?= executor +EXECUTOR_IMAGE_NAME ?= kk-executor EXECUTOR_CONTROLLER_IMG ?= $(REGISTRY)/$(EXECUTOR_IMAGE_NAME) # bootstrap -K3S_BOOTSTRAP_IMAGE_NAME ?= k3s-bootstrap-controller -K3S_BOOTSTRAP_CONTROLLER_IMG ?= $(REGISTRY)/$(K3S_BOOTSTRAP_IMAGE_NAME) +#K3S_BOOTSTRAP_IMAGE_NAME ?= k3s-bootstrap-controller +#K3S_BOOTSTRAP_CONTROLLER_IMG ?= $(REGISTRY)/$(K3S_BOOTSTRAP_IMAGE_NAME) # control plane -K3S_CONTROL_PLANE_IMAGE_NAME ?= k3s-control-plane-controller -K3S_CONTROL_PLANE_CONTROLLER_IMG ?= $(REGISTRY)/$(K3S_CONTROL_PLANE_IMAGE_NAME) +#K3S_CONTROL_PLANE_IMAGE_NAME ?= k3s-control-plane-controller +#K3S_CONTROL_PLANE_CONTROLLER_IMG ?= $(REGISTRY)/$(K3S_CONTROL_PLANE_IMAGE_NAME) # It is set by Prow GIT_TAG, a git-based tag of the form vYYYYMMDD-hash, e.g., v20210120-v0.3.10-308-gc61521971 diff --git a/config/helm/values.yaml b/config/helm/values.yaml index de4e26fe..16611376 100644 --- a/config/helm/values.yaml +++ b/config/helm/values.yaml @@ -1,7 +1,7 @@ ## @section Common parameters ## global: - imageRegistry: hub.kubesphere.com.cn/kubekey + imageRegistry: "" tag: "" imagePullSecrets: [] @@ -43,7 +43,7 @@ operator: pullSecrets: [] image: registry: "" - repository: controller-manager + repository: kubesphere/kk-controller-manager tag: "" digest: "" pullPolicy: IfNotPresent @@ -77,7 +77,7 @@ operator: executor: image: registry: "" - repository: executor + repository: kubesphere/kk-executor tag: "" digest: "" pullPolicy: IfNotPresent