Skip to content

Commit

Permalink
Merge pull request #334 from kubevirt-bot/cherry-pick-333-to-release-…
Browse files Browse the repository at this point in the history
…v0.14

[release-v0.14] Update apiextensions version used in csv-generator to v1
  • Loading branch information
kubevirt-bot authored Apr 8, 2022
2 parents 6c9da39 + 2c1098e commit 3f03dea
Show file tree
Hide file tree
Showing 18 changed files with 8 additions and 13,319 deletions.
6 changes: 5 additions & 1 deletion data/crd/ssp.kubevirt.io_ssps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,11 @@ spec:
singular: ssp
scope: Namespaced
versions:
- name: v1beta1
- additionalPrinterColumns:
- jsonPath: .status.phase
name: Phase
type: string
name: v1beta1
schema:
openAPIV3Schema:
description: SSP is the Schema for the ssps API
Expand Down
6 changes: 3 additions & 3 deletions hack/csv-generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
csvv1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
"github.com/spf13/cobra"
v1 "k8s.io/api/core/v1"
extv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/util/yaml"
"kubevirt.io/ssp-operator/internal/common"
Expand Down Expand Up @@ -124,7 +124,7 @@ func runGenerator() error {
return err
}
for _, file := range files {
crd := extv1beta1.CustomResourceDefinition{}
crd := extv1.CustomResourceDefinition{}

err := readAndDecodeToCRD(file, &crd)
if err != nil {
Expand All @@ -139,7 +139,7 @@ func runGenerator() error {
return nil
}

func readAndDecodeToCRD(file os.FileInfo, crd *extv1beta1.CustomResourceDefinition) error {
func readAndDecodeToCRD(file os.FileInfo, crd *extv1.CustomResourceDefinition) error {
crdFile, err := ioutil.ReadFile(fmt.Sprintf("data/crd/%s", file.Name()))
if err != nil {
return err
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 3f03dea

Please sign in to comment.