Skip to content

Commit 2d835e7

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #927 from jhadvig/console-4055
OCPBUGS-39357, CONSOLE-4055: Vendor API changes
2 parents ea9b76c + 4bf1d68 commit 2d835e7

29 files changed

+1021
-2729
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ require (
1111
github.com/go-bindata/go-bindata v3.1.2+incompatible
1212
github.com/go-test/deep v1.0.5
1313
github.com/google/go-cmp v0.6.0
14-
github.com/openshift/api v0.0.0-20240730123620-ae8eac7b3268
14+
github.com/openshift/api v0.0.0-20240829142534-9266736a1069
1515
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52
1616
github.com/openshift/client-go v0.0.0-20240523113335-452272e0496d
1717
github.com/openshift/library-go v0.0.0-20240124134907-4dfbf6bc7b11

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY
144144
github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM=
145145
github.com/onsi/gomega v1.31.0 h1:54UJxxj6cPInHS3a35wm6BK/F9nHYueZ1NVujHDrnXE=
146146
github.com/onsi/gomega v1.31.0/go.mod h1:DW9aCi7U6Yi40wNVAvT6kzFnEVEI5n3DloYBiKiT6zk=
147-
github.com/openshift/api v0.0.0-20240730123620-ae8eac7b3268 h1:531fmfVMUHRaH0D6FeDD/HSurupo3s4XNCII4g0oUTA=
148-
github.com/openshift/api v0.0.0-20240730123620-ae8eac7b3268/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
147+
github.com/openshift/api v0.0.0-20240829142534-9266736a1069 h1:0fjdMcP65IJfhg7dxJNdcYv5pPu88zzlYDASBlZPMAo=
148+
github.com/openshift/api v0.0.0-20240829142534-9266736a1069/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
149149
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52 h1:bqBwrXG7sbJUqP1Og1bR8FvVh7qb7CrMgy9saKmOZFs=
150150
github.com/openshift/build-machinery-go v0.0.0-20240419090851-af9c868bcf52/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
151151
github.com/openshift/client-go v0.0.0-20240523113335-452272e0496d h1:Dq21KMlDTVy2fCIyp0gsW+6ir6FwD3RjnCuza2/bIyM=

‎vendor/github.com/openshift/api/Dockerfile.rhel8‎ renamed to ‎vendor/github.com/openshift/api/Dockerfile.ocp‎

File renamed without changes.

‎vendor/github.com/openshift/api/Makefile‎

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1/types_feature.go‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1alpha1/types_cluster_image_policy.go‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1alpha1/types_image_policy.go‎

Lines changed: 4 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1alpha1/zz_generated.featuregated-crd-manifests.yaml‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/config/v1alpha1/zz_generated.swagger_doc_generated.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/openshift/api/console/v1/zz_generated.crd-manifests/90_consoleplugins.crd.yaml‎

Lines changed: 0 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)