From 863fa7f98e7fd877d6e6cc48f37ad152bc270189 Mon Sep 17 00:00:00 2001 From: Mansi Kulkarni Date: Mon, 16 Oct 2023 15:10:26 -0400 Subject: [PATCH] [vendor] Use v1.27.6+88e9b4c k8s and OpenShift libraries This commit was generated using hack/update_submodules.sh --- go.mod | 4 ++-- go.sum | 10 +++++----- ...hift-controller-manager-operator_01_build.crd.yaml} | 1 + .../api/config/v1/stable.build.testsuite.yaml | 2 +- vendor/modules.txt | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) rename vendor/github.com/openshift/api/config/v1/{0000_10_config-operator_01_build.crd.yaml => 0000_10_openshift-controller-manager-operator_01_build.crd.yaml} (99%) diff --git a/go.mod b/go.mod index 33f6d0955..9d9be9404 100644 --- a/go.mod +++ b/go.mod @@ -8,10 +8,10 @@ require ( github.com/coreos/ignition/v2 v2.16.2 github.com/go-imports-organizer/goio v1.3.3 github.com/go-logr/logr v1.2.4 - github.com/openshift/api v0.0.0-20230918105526-6488b1202507 + github.com/openshift/api v0.0.0-20231012190404-7b36cb38c7d0 github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb github.com/openshift/library-go v0.0.0-20230922122527-75af1bc5cb98 - github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc + github.com/openshift/machine-config-operator v0.0.1-0.20231012141247-20d95766e888 github.com/operator-framework/api v0.16.0 github.com/operator-framework/operator-lib v0.4.0 github.com/operator-framework/operator-lifecycle-manager v0.22.0 diff --git a/go.sum b/go.sum index f2fd4038d..5e7e03a36 100644 --- a/go.sum +++ b/go.sum @@ -482,15 +482,15 @@ github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1y github.com/onsi/gomega v1.10.2/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= -github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU= -github.com/openshift/api v0.0.0-20230918105526-6488b1202507 h1:WcJnVswQUi7BEq1fsRkGU3iqVpID3lpOlYjFNND8tXI= -github.com/openshift/api v0.0.0-20230918105526-6488b1202507/go.mod h1:yimSGmjsI+XF1mr+AKBs2//fSXIOhhetHGbMlBEfXbs= +github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c= +github.com/openshift/api v0.0.0-20231012190404-7b36cb38c7d0 h1:+XsCYpNsZ0Arx95PDvIbPnpkj4Cd8scHWdnMlNvXiKk= +github.com/openshift/api v0.0.0-20231012190404-7b36cb38c7d0/go.mod h1:yimSGmjsI+XF1mr+AKBs2//fSXIOhhetHGbMlBEfXbs= github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb h1:laYRaVm1tMdTLkZERvj9muJDvUtYo2HjRoo4Xu55EfM= github.com/openshift/client-go v0.0.0-20230807132528-be5346fb33cb/go.mod h1:eCLby3OeidJ9+8GcvvGROU6hsCv2XAPQw8EO7d8NbQA= github.com/openshift/library-go v0.0.0-20230922122527-75af1bc5cb98 h1:1B7m0/J2CJgZ+Cq4kCAtxqeaNhclV2Haw5GeWlr9q1Q= github.com/openshift/library-go v0.0.0-20230922122527-75af1bc5cb98/go.mod h1:ZFwNwC3opc/7aOvzUbU95zp33Lbxet48h80ryH3p6DY= -github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc h1:m8c26gPEv0p621926Kl26kYQvnkOrW7pOirvYzORn24= -github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc/go.mod h1:ftCpVtU6Q31exB0DTBn9s2eu90RJESOSisNAruWkvcE= +github.com/openshift/machine-config-operator v0.0.1-0.20231012141247-20d95766e888 h1:OLpse46TzhmuHT/Nv4logWtNktmIeQS3ZYltfa3oHvo= +github.com/openshift/machine-config-operator v0.0.1-0.20231012141247-20d95766e888/go.mod h1:ftCpVtU6Q31exB0DTBn9s2eu90RJESOSisNAruWkvcE= github.com/operator-framework/api v0.5.2/go.mod h1:L7IvLd/ckxJEJg/t4oTTlnHKAJIP/p51AvEslW3wYdY= github.com/operator-framework/api v0.16.0 h1:swUOhVv7QDszxBTwYM8QAtyeqI4EQHNVAiKMS+xjakY= github.com/operator-framework/api v0.16.0/go.mod h1:kk8xJahHJR3bKqrA+A+1VIrhOTmyV76k+ARv+iV+u1Q= diff --git a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml b/vendor/github.com/openshift/api/config/v1/0000_10_openshift-controller-manager-operator_01_build.crd.yaml similarity index 99% rename from vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml rename to vendor/github.com/openshift/api/config/v1/0000_10_openshift-controller-manager-operator_01_build.crd.yaml index 75166deb7..9e80775ff 100644 --- a/vendor/github.com/openshift/api/config/v1/0000_10_config-operator_01_build.crd.yaml +++ b/vendor/github.com/openshift/api/config/v1/0000_10_openshift-controller-manager-operator_01_build.crd.yaml @@ -3,6 +3,7 @@ kind: CustomResourceDefinition metadata: annotations: api-approved.openshift.io: https://github.com/openshift/api/pull/470 + capability.openshift.io/name: Build include.release.openshift.io/ibm-cloud-managed: "true" include.release.openshift.io/self-managed-high-availability: "true" include.release.openshift.io/single-node-developer: "true" diff --git a/vendor/github.com/openshift/api/config/v1/stable.build.testsuite.yaml b/vendor/github.com/openshift/api/config/v1/stable.build.testsuite.yaml index cdd8a9b70..b422ebd20 100644 --- a/vendor/github.com/openshift/api/config/v1/stable.build.testsuite.yaml +++ b/vendor/github.com/openshift/api/config/v1/stable.build.testsuite.yaml @@ -1,6 +1,6 @@ apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this name: "[Stable] Build" -crd: 0000_10_config-operator_01_build.crd.yaml +crd: 0000_10_openshift-controller-manager-operator_01_build.crd.yaml tests: onCreate: - name: Should be able to create a minimal Build diff --git a/vendor/modules.txt b/vendor/modules.txt index e5eae68a1..d58878c9c 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -257,7 +257,7 @@ github.com/monochromegane/go-gitignore # github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 ## explicit github.com/munnerz/goautoneg -# github.com/openshift/api v0.0.0-20230918105526-6488b1202507 +# github.com/openshift/api v0.0.0-20231012190404-7b36cb38c7d0 ## explicit; go 1.20 github.com/openshift/api/config/v1 github.com/openshift/api/config/v1alpha1 @@ -309,7 +309,7 @@ github.com/openshift/library-go/pkg/image/imageutil github.com/openshift/library-go/pkg/image/internal/digest github.com/openshift/library-go/pkg/image/internal/reference github.com/openshift/library-go/pkg/image/reference -# github.com/openshift/machine-config-operator v0.0.1-0.20231002195040-a2469941c0dc +# github.com/openshift/machine-config-operator v0.0.1-0.20231012141247-20d95766e888 ## explicit; go 1.20 github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1 # github.com/operator-framework/api v0.16.0