diff --git a/.github/workflows/e2e-tools.yml b/.github/workflows/e2e-tools.yml index c4422131e4..b621b26132 100644 --- a/.github/workflows/e2e-tools.yml +++ b/.github/workflows/e2e-tools.yml @@ -52,7 +52,7 @@ jobs: kind create cluster --config=hack/kind-config-e2e-no-registry.yaml --image kindest/node:v1.26.6@sha256:6e2d8b28a5b601defe327b98bd1c2d1930b49e5d8c512e1895099e4504007adb kubectl label node kind-worker node-role.kubernetes.io/worker='' - - name: Deploy RTE Operator + - name: Deploy NUMA Resources Operator run: | # we only need the manifests, this happens to be the easiest way known to date KUSTOMIZE_DEPLOY_DIR="config/kind-ci/" make deploy diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 0332d9b026..f8c97d76bf 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -52,7 +52,7 @@ jobs: kubectl label node kind-worker node-role.kubernetes.io/worker='' kind load docker-image ${built_image} - - name: Deploy RTE Operator + - name: Deploy NUMA Resources Operator run: | IMG=${built_image} KUSTOMIZE_DEPLOY_DIR="config/kind-ci/" make deploy diff --git a/Makefile b/Makefile index 84ef9db183..a1b30ea9e8 100644 --- a/Makefile +++ b/Makefile @@ -43,10 +43,6 @@ BUNDLE_IMG ?= $(IMAGE_TAG_BASE)-bundle:$(VERSION) # Image URL to use all building/pushing image targets IMG ?= $(IMAGE_TAG_BASE):$(VERSION) CRD_OPTIONS ?= "crd" -# Specify the URL link to the machine config pool CRD -CRD_MACHINE_CONFIG_POOL_URL ?= "https://raw.githubusercontent.com/openshift/machine-config-operator/master/install/0000_80_machine-config-operator_01_machineconfigpool.crd.yaml" -# Specify the URL link to the kubeletconfig CRD -CRD_KUBELET_CONFIG_URL ?= https://raw.githubusercontent.com/openshift/machine-config-operator/master/install/0000_80_machine-config-operator_01_kubeletconfig.crd.yaml # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.29 diff --git a/hack/deploy-mco-crds.sh b/hack/deploy-mco-crds.sh index c7c175875e..86ccfee771 100755 --- a/hack/deploy-mco-crds.sh +++ b/hack/deploy-mco-crds.sh @@ -3,9 +3,9 @@ source hack/common.sh # Specify the URL link to the machine config pool CRD -CRD_MACHINE_CONFIG_POOL_URL="https://raw.githubusercontent.com/openshift/machine-config-operator/master/install/0000_80_machine-config-operator_01_machineconfigpool.crd.yaml" +CRD_MACHINE_CONFIG_POOL_URL="https://raw.githubusercontent.com/openshift/machine-config-operator/master/install/0000_80_machine-config_01_machineconfigpools-Default.crd.yaml" # Specify the URL link to the kubeletconfig CRD -CRD_KUBELET_CONFIG_URL="https://raw.githubusercontent.com/openshift/machine-config-operator/master/install/0000_80_machine-config-operator_01_kubeletconfig.crd.yaml" +CRD_KUBELET_CONFIG_URL="https://raw.githubusercontent.com/openshift/machine-config-operator/master/install/0000_80_machine-config_01_kubeletconfigs.crd.yaml" [ ! -x ${REPO_DIR}/bin/lsplatform ] && exit 1