Skip to content

Enable Subscription config in OperandRegistry #738

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
merged 3 commits into from
Aug 23, 2021
Merged

Enable Subscription config in OperandRegistry #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2bb7268
fix: Operator only reconciles when watched subscriptions are updated.
horis233 Aug 22, 2021
bf672b7
Merge remote-tracking branch 'upstream/master' into sub-config
horis233 Aug 22, 2021
2ac9e98
feat: Enable subscription config option in the operandregistry
horis233 Aug 23, 2021
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
3 changes: 3 additions & 0 deletions api/v1alpha1/operandregistry_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ type Operator struct {
// StartingCSV of the installation.
// +optional
StartingCSV string `json:"startingCSV,omitempty"`
// SubscriptionConfig is used to override operator configuration.
// +optional
SubscriptionConfig *olmv1alpha1.SubscriptionConfig `json:"subscriptionConfig,omitempty"`
}

// +kubebuilder:validation:Enum=public;private
Expand Down
6 changes: 6 additions & 0 deletions api/v1alpha1/zz_generated.deepcopy.go
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion bundle/manifests/operator.ibm.com_operandbindinfos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
labels:
app.kubernetes.io/instance: operand-deployment-lifecycle-manager
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/operator.ibm.com_operandconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
labels:
app.kubernetes.io/instance: operand-deployment-lifecycle-manager
Expand Down
1,921 changes: 1,920 additions & 1 deletion bundle/manifests/operator.ibm.com_operandregistries.yaml
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bundle/manifests/operator.ibm.com_operandrequests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
labels:
app.kubernetes.io/instance: operand-deployment-lifecycle-manager
Expand Down
30 changes: 21 additions & 9 deletions config/crd/bases/operator.ibm.com_operandbindinfos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: operandbindinfos.operator.ibm.com
spec:
Expand Down Expand Up @@ -35,10 +35,14 @@ spec:
description: OperandBindInfo is the Schema for the operandbindinfoes API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
Expand All @@ -50,24 +54,32 @@ spec:
description: SecretConfigmap is a pair of Secret and/or Configmap.
properties:
configmap:
description: The configmap identifies an existing configmap object. if it exists, the ODLM will share to the namespace of the OperandRequest.
description: The configmap identifies an existing configmap
object. if it exists, the ODLM will share to the namespace
of the OperandRequest.
type: string
secret:
description: The secret identifies an existing secret. if it exists, the ODLM will share to the namespace of the OperandRequest.
description: The secret identifies an existing secret. if it
exists, the ODLM will share to the namespace of the OperandRequest.
type: string
type: object
description: The bindings section is used to specify information about the access/configuration data that is to be shared.
description: The bindings section is used to specify information about
the access/configuration data that is to be shared.
type: object
description:
type: string
operand:
description: The deployed service identifies itself with its operand. This must match the name in the OperandRegistry in the current namespace.
description: The deployed service identifies itself with its operand.
This must match the name in the OperandRegistry in the current namespace.
type: string
registry:
description: The registry identifies the name of the name of the OperandRegistry CR from which this operand deployment is being requested.
description: The registry identifies the name of the name of the OperandRegistry
CR from which this operand deployment is being requested.
type: string
registryNamespace:
description: Specifies the namespace in which the OperandRegistry reside. The default is the current namespace in which the request is defined.
description: Specifies the namespace in which the OperandRegistry
reside. The default is the current namespace in which the request
is defined.
type: string
required:
- operand
Expand Down
13 changes: 9 additions & 4 deletions config/crd/bases/operator.ibm.com_operandconfigs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.5.0
controller-gen.kubebuilder.io/version: v0.6.1
creationTimestamp: null
name: operandconfigs.operator.ibm.com
spec:
Expand Down Expand Up @@ -35,10 +35,14 @@ spec:
description: OperandConfig is the Schema for the operandconfigs API.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
description: 'APIVersion defines the versioned schema of this representation
of an object. Servers should convert recognized schemas to the latest
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
type: string
kind:
description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: 'Kind is a string value representing the REST resource this
object represents. Servers may infer this from the endpoint the client
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
type: string
metadata:
type: object
Expand Down Expand Up @@ -72,7 +76,8 @@ spec:
description: OperandConfigStatus defines the observed state of OperandConfig.
properties:
phase:
description: Phase describes the overall phase of operands in the OperandConfig.
description: Phase describes the overall phase of operands in the
OperandConfig.
type: string
serviceStatus:
additionalProperties:
Expand Down
Loading