From 774d28447fe2b4eb5119673940511f3dbc9af2e1 Mon Sep 17 00:00:00 2001 From: Ruth Netser Date: Sun, 23 Apr 2023 13:09:57 +0300 Subject: [PATCH 1/2] Add RHMI custom resource (#1195) * Add RHMI custom resource * Add to insolidarity ignore list * Add to insolidarity ignore list * Add to insolidarity ignore list --- .github/in-solidarity.yml | 2 ++ ocp_resources/resource.py | 1 + ocp_resources/rhmi.py | 10 ++++++++++ 3 files changed, 13 insertions(+) create mode 100644 ocp_resources/rhmi.py diff --git a/.github/in-solidarity.yml b/.github/in-solidarity.yml index 068ffa6dc0..8c835192b0 100644 --- a/.github/in-solidarity.yml +++ b/.github/in-solidarity.yml @@ -12,3 +12,5 @@ ignore: - ".github/workflows/*.yml" - "**/*.yml" - ".release-it.json" + - "ocp_resources/grafana*" # TODO: Remove when updated upstream https://github.com/grafana-operator/grafana-operator/issues/898 + - "ocp_resources/rhmi*" diff --git a/ocp_resources/resource.py b/ocp_resources/resource.py index e22bdfa061..5a92b6d144 100644 --- a/ocp_resources/resource.py +++ b/ocp_resources/resource.py @@ -248,6 +248,7 @@ class ApiGroup: HOSTPATHPROVISIONER_KUBEVIRT_IO = "hostpathprovisioner.kubevirt.io" IMAGE_OPENSHIFT_IO = "image.openshift.io" IMAGE_REGISTRY = "registry.redhat.io" + INTEGREATLY_ORG = "integreatly.org" K8S_CNI_CNCF_IO = "k8s.cni.cncf.io" K8S_V1_CNI_CNCF_IO = "k8s.v1.cni.cncf.io" KUBERNETES_IO = "kubernetes.io" diff --git a/ocp_resources/rhmi.py b/ocp_resources/rhmi.py new file mode 100644 index 0000000000..afe2361c91 --- /dev/null +++ b/ocp_resources/rhmi.py @@ -0,0 +1,10 @@ +from ocp_resources.resource import NamespacedResource + + +class RHMI(NamespacedResource): + """ + RHMI custom resource created by Red Hat Openshift API Management (RHOAM) + https://github.com/integr8ly/integreatly-operator/blob/master/apis/v1alpha1/rhmi_types.go + """ + + api_group = NamespacedResource.ApiGroup.INTEGREATLY_ORG From 1c51e2cd45a0474bf26269d2788e6b8ce5bf780e Mon Sep 17 00:00:00 2001 From: rnetser Date: Sun, 23 Apr 2023 13:16:20 +0300 Subject: [PATCH 2/2] Update in-solidarity.yml --- .github/in-solidarity.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/in-solidarity.yml b/.github/in-solidarity.yml index 8c835192b0..ea6a3ccb28 100644 --- a/.github/in-solidarity.yml +++ b/.github/in-solidarity.yml @@ -12,5 +12,4 @@ ignore: - ".github/workflows/*.yml" - "**/*.yml" - ".release-it.json" - - "ocp_resources/grafana*" # TODO: Remove when updated upstream https://github.com/grafana-operator/grafana-operator/issues/898 - "ocp_resources/rhmi*"