Skip to content

Remove license year 2: Electric Boogaloo #1419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 2, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -160,8 +160,11 @@ manifests: vendor

$(YQ_INTERNAL) w --inplace deploy/chart/crds/0000_50_olm_03-clusterserviceversion.crd.yaml spec.validation.openAPIV3Schema.properties.spec.properties.install.properties.spec.properties.deployments.items.properties.spec.properties.template.properties.metadata.x-kubernetes-preserve-unknown-fields true

# Generate clients, listers, and informers
# Generate deepcopy, conversion, clients, listers, and informers
codegen:
# Deepcopy
$(CONTROLLER_GEN) object:headerFile=./boilerplate.go.txt paths=./pkg/api/apis/operators/...i
# Conversion, clients, listers, and informers
$(CODEGEN)

# Generate mock types.
2 changes: 1 addition & 1 deletion boilerplate.go.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright YEAR Red Hat, Inc.
Copyright Red Hat, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
6 changes: 3 additions & 3 deletions pkg/api/apis/operators/clusterserviceversion_types.go
Original file line number Diff line number Diff line change
@@ -77,7 +77,7 @@ type StatusDescriptor struct {
DisplayName string
Description string
XDescriptors []string
Value *json.RawMessage
Value json.RawMessage
}

// SpecDescriptor describes a field in a spec block of a CRD so that OLM can consume it
@@ -86,7 +86,7 @@ type SpecDescriptor struct {
DisplayName string
Description string
XDescriptors []string
Value *json.RawMessage
Value json.RawMessage
}

// ActionDescriptor describes a declarative action that can be performed on a custom resource instance
@@ -95,7 +95,7 @@ type ActionDescriptor struct {
DisplayName string
Description string
XDescriptors []string
Value *json.RawMessage
Value json.RawMessage
}

// CRDDescription provides details to OLM about the CRDs
2 changes: 1 addition & 1 deletion pkg/api/apis/operators/v1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 3 additions & 7 deletions pkg/api/apis/operators/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions pkg/api/apis/operators/v1alpha1/clusterserviceversion_types.go
Original file line number Diff line number Diff line change
@@ -82,8 +82,8 @@ type StatusDescriptor struct {
DisplayName string `json:"displayName,omitempty"`
Description string `json:"description,omitempty"`
// +listType=set
XDescriptors []string `json:"x-descriptors,omitempty"`
Value *json.RawMessage `json:"value,omitempty"`
XDescriptors []string `json:"x-descriptors,omitempty"`
Value json.RawMessage `json:"value,omitempty"`
}

// SpecDescriptor describes a field in a spec block of a CRD so that OLM can consume it
@@ -93,8 +93,8 @@ type SpecDescriptor struct {
DisplayName string `json:"displayName,omitempty"`
Description string `json:"description,omitempty"`
// +listType=set
XDescriptors []string `json:"x-descriptors,omitempty"`
Value *json.RawMessage `json:"value,omitempty"`
XDescriptors []string `json:"x-descriptors,omitempty"`
Value json.RawMessage `json:"value,omitempty"`
}

// ActionDescriptor describes a declarative action that can be performed on a custom resource instance
@@ -104,8 +104,8 @@ type ActionDescriptor struct {
DisplayName string `json:"displayName,omitempty"`
Description string `json:"description,omitempty"`
// +listType=set
XDescriptors []string `json:"x-descriptors,omitempty"`
Value *json.RawMessage `json:"value,omitempty"`
XDescriptors []string `json:"x-descriptors,omitempty"`
Value json.RawMessage `json:"value,omitempty"`
}

// CRDDescription provides details to OLM about the CRDs
14 changes: 7 additions & 7 deletions pkg/api/apis/operators/v1alpha1/zz_generated.conversion.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading