Merge pull request #1419 from njhale/fix-codegen

Remove license year 2: Electric Boogaloo

Author: openshift-merge-robot

Makefile

@@ -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.

boilerplate.go.txt

@@ -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.

pkg/api/apis/operators/clusterserviceversion_types.go

@@ -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

pkg/api/apis/operators/v1/zz_generated.conversion.go

@@ -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