Skip to content

Commit 844369a

Browse files
committed
chore(api): bump operatorgroup and packagemanifest to v1 and group
operators.coreos.com
1 parent 280c674 commit 844369a

File tree

71 files changed

+832
-833
lines changed

Some content is hidden

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

71 files changed

+832
-833
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,9 @@ codegen:
127127
cp scripts/generate_groups.sh vendor/k8s.io/code-generator/generate_groups.sh
128128
mkdir -p vendor/k8s.io/code-generator/hack
129129
cp boilerplate.go.txt vendor/k8s.io/code-generator/hack/boilerplate.go.txt
130-
go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go --logtostderr -i ./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/version,./pkg/package-server/apis/packagemanifest/v1alpha1,./pkg/api/apis/operators/v1alpha1 -p $(PKG)/pkg/package-server/apis/openapi -O zz_generated.openapi -h boilerplate.go.txt -r /dev/null
131-
$(CODEGEN) all $(PKG)/pkg/api/client $(PKG)/pkg/api/apis "operators:v1alpha1,v1alpha2"
132-
$(CODEGEN) all $(PKG)/pkg/package-server/client $(PKG)/pkg/package-server/apis "packagemanifest:v1alpha1"
130+
go run vendor/k8s.io/kube-openapi/cmd/openapi-gen/openapi-gen.go --logtostderr -i ./vendor/k8s.io/apimachinery/pkg/runtime,./vendor/k8s.io/apimachinery/pkg/apis/meta/v1,./vendor/k8s.io/apimachinery/pkg/version,./pkg/package-server/apis/packagemanifest/v1,./pkg/api/apis/operators/v1alpha1 -p $(PKG)/pkg/package-server/apis/openapi -O zz_generated.openapi -h boilerplate.go.txt -r /dev/null
131+
$(CODEGEN) all $(PKG)/pkg/api/client $(PKG)/pkg/api/apis "operators:v1alpha1,v1"
132+
$(CODEGEN) all $(PKG)/pkg/package-server/client $(PKG)/pkg/package-server/apis "packagemanifest:v1"
133133

134134
container-codegen:
135135
docker build -t olm:codegen -f codegen.Dockerfile .

deploy/chart/templates/0000_50_olm_10-operatorgroup.crd.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ metadata:
44
name: operatorgroups.operators.coreos.com
55
spec:
66
group: operators.coreos.com
7-
version: v1alpha2
7+
version: v1
88
versions:
9-
- name: v1alpha2
9+
- name: v1
1010
served: true
1111
storage: true
1212
names:
@@ -91,4 +91,4 @@ spec:
9191
- lastUpdated
9292
type: object
9393
required:
94-
- metadata
94+
- metadata

deploy/chart/templates/0000_50_olm_13-operatorgroup-default.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
apiVersion: operators.coreos.com/v1alpha2
1+
apiVersion: operators.coreos.com/v1
22
kind: OperatorGroup
33
metadata:
44
name: global-operators
55
namespace: {{ .Values.operator_namespace }}
66
---
7-
apiVersion: operators.coreos.com/v1alpha2
7+
apiVersion: operators.coreos.com/v1
88
kind: OperatorGroup
99
metadata:
1010
name: olm-operators

deploy/chart/templates/0000_50_olm_16-packageserver.clusterserviceversion.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ spec:
6363
version: {{ .Chart.Version }}
6464
apiservicedefinitions:
6565
owned:
66-
- group: packages.apps.redhat.com
67-
version: v1alpha1
66+
- group: operators.coreos.com
67+
version: v1
6868
kind: PackageManifest
6969
name: packagemanifest
7070
displayName: PackageManifest
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
// +k8s:deepcopy-gen=package
22
// +groupName=operators.coreos.com
3-
package v1alpha2
3+
package v1

pkg/api/apis/operators/v1alpha2/operatorgroup_types.go renamed to pkg/api/apis/operators/v1/operatorgroup_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package v1alpha2
1+
package v1
22

33
import (
44
"sort"

pkg/api/apis/operators/v1alpha2/register.go renamed to pkg/api/apis/operators/v1/register.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package v1alpha2
1+
package v1
22

33
import (
44
"k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/scheme"
@@ -12,7 +12,7 @@ import (
1212

1313
const (
1414
GroupName = "operators.coreos.com"
15-
GroupVersion = "v1alpha2"
15+
GroupVersion = "v1"
1616
)
1717

1818
// SchemeGroupVersion is group version used to register these objects

pkg/api/apis/operators/v1alpha2/zz_generated.deepcopy.go renamed to pkg/api/apis/operators/v1/zz_generated.deepcopy.go

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

pkg/api/client/clientset/versioned/clientset.go

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

pkg/api/client/clientset/versioned/fake/clientset_generated.go

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

0 commit comments

Comments
 (0)