Skip to content

openshift: crd: update to deal with latest CRDs #924

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
Apr 16, 2024
Merged

openshift: crd: update to deal with latest CRDs #924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 0 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions hack/deploy-mco-crds.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down