Skip to content

updated Makefile to generate proper CSV #988

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.

Sign up for GitHub

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
ibm-ci-bot merged 5 commits into from
Oct 31, 2023
Merged

updated Makefile to generate proper CSV #988

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46d0ae3
fixed make manifests for OperandConfig CRD
bitscuit Oct 26, 2023
410dd58
regenerated deepcopy
bitscuit Oct 27, 2023
767879b
added make kustomize
bitscuit Oct 27, 2023
3a63ee3
added make run-bundle and make cleanup-bundle
bitscuit Oct 30, 2023
d4cbcce
changed tests to use ExtensionWithMarker type
bitscuit Oct 30, 2023
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
Next Next commit
fixed make manifests for OperandConfig CRD 
- to have preserve unknown fields for ConfigService.spec

Signed-off-by: Henry H Li <[email protected]>
  • Loading branch information
@bitscuit
bitscuit committed Oct 26, 2023
commit 46d0ae3bbb5c7832c8e3c69c311cf6b8be551591
7 changes: 6 additions & 1 deletion api/v1alpha1/operandconfig_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,17 @@ type OperandConfigSpec struct {
Services []ConfigService `json:"services,omitempty"`
}

// +kubebuilder:pruning:PreserveUnknownFields
type ExtensionWithMarker struct {
runtime.RawExtension `json:",inline"`
}

// ConfigService defines the configuration of the service.
type ConfigService struct {
// Name is the subscription name.
Name string `json:"name"`
// Spec is the configuration map of custom resource.
Spec map[string]runtime.RawExtension `json:"spec,omitempty"`
Spec map[string]ExtensionWithMarker `json:"spec,omitempty"`
// State is a flag to enable or disable service.
State string `json:"state,omitempty"`
// Resources is used to specify the kubernetes resources that are needed for the service.
Expand Down