Skip to content

Commit 506cf3d

Browse files
Merge pull request #816 from jhadvig/CONSOLE-3652
CONSOLE-3652: Create StorageVersionMigration for ConsolePlugin CRD v1 migration
2 parents 8688bb1 + 559f564 commit 506cf3d

File tree

79 files changed

+6312
-188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+6312
-188
lines changed

Dockerfile.rhel7

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ COPY manifests /manifests/
1616
COPY quickstarts/*.yaml /manifests/
1717

1818
# extensions manifests generated from openshift/api types
19-
COPY vendor/github.com/openshift/api/console/*/*.crd.yaml /manifests/
19+
COPY vendor/github.com/openshift/api/console/v1/*.crd.yaml /manifests/
2020
COPY vendor/github.com/openshift/api/operator/*/*console-operator*.crd.yaml /manifests/
2121
COPY vendor/github.com/openshift/api/helm/*/*crd.yaml /manifests/
2222

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ require (
99
github.com/go-bindata/go-bindata v3.1.2+incompatible
1010
github.com/go-test/deep v1.0.5
1111
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
12-
github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6
12+
github.com/openshift/api v0.0.0-20231128131348-2eef5be42ab4
1313
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d
1414
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1
1515
github.com/openshift/library-go v0.0.0-20230927113136-405c34317fa4

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
132132
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
133133
github.com/onsi/ginkgo/v2 v2.9.4 h1:xR7vG4IXt5RWx6FfIjyAtsoMAtnc3C/rFXBBd2AjZwE=
134134
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
135-
github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6 h1:dLPcRvLeZs3ATgXCVrU/ZEVssHO5636sodMdJVAPPUQ=
136-
github.com/openshift/api v0.0.0-20231003083825-c3f7566f6ef6/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
135+
github.com/openshift/api v0.0.0-20231128131348-2eef5be42ab4 h1:ppUXiEZUzidEw2VAah8lLHP0fr5WvckDKdL/CaTDAnc=
136+
github.com/openshift/api v0.0.0-20231128131348-2eef5be42ab4/go.mod h1:qNtV0315F+f8ld52TLtPvrfivZpdimOzTi3kn9IVbtU=
137137
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d h1:RR4ah7FfaPR1WePizm0jlrsbmPu91xQZnAsVVreQV1k=
138138
github.com/openshift/build-machinery-go v0.0.0-20220913142420-e25cf57ea46d/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
139139
github.com/openshift/client-go v0.0.0-20230926161409-848405da69e1 h1:W1N/3nVciqmjPjn2xldHjb0AwwCQzlGxLvX5BCgE8H4=
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
apiVersion: migration.k8s.io/v1alpha1
2+
kind: StorageVersionMigration
3+
metadata:
4+
name: console-plugin-storage-version-migration
5+
annotations:
6+
include.release.openshift.io/ibm-cloud-managed: "true"
7+
include.release.openshift.io/self-managed-high-availability: "true"
8+
include.release.openshift.io/single-node-developer: "true"
9+
spec:
10+
resource:
11+
group: console.openshift.io
12+
version: v1
13+
resource: consoleplugins

vendor/github.com/openshift/api/Dockerfile.rhel8

Lines changed: 3 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/OWNERS

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

vendor/github.com/openshift/api/README.md

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/build/v1/consts.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/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml

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

0 commit comments

Comments
 (0)