Skip to content
Merged
Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions deploy/crds/enterprise.splunk.com_clustermasters_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ spec:
scope: Namespaced
versions:
- additionalPrinterColumns:
- description: Status of cluster master
- description: Status of cluster manager
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't these changes supposed to be independent of the release changes? Not sure if I am missing something. Are we making the changes from master to manager explicitly here along with the release changes?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this is a missing change on Develop. I can see the same on my local build.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This wasn't intended. I believe is caused because of this change.

It shouldn't be harmful but we might want to roll back to keep it consistent for the release. @pdhanoyasplunk , @smohan-splunk. If we roll back we'll have to rerun the workflow. What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, although not harmful, its better we roll back since CRD version doesn't change this release. We can bring these back with MC CRD changes post 1.0.3 release

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After further discussion, we decided to keep the changes

jsonPath: .status.phase
name: Phase
type: string
Expand Down Expand Up @@ -760,7 +760,7 @@ spec:
description: Full path or URL for one or more defaults.yml files specific
to App install, separated by commas. The defaults listed here will
be installed on the CM, standalone, search head deployer or license
master instance.
manager instance.
type: string
etcVolumeStorageConfig:
description: Storage configuration for /opt/splunk/etc volume
Expand Down Expand Up @@ -896,7 +896,7 @@ spec:
type: string
licenseMasterRef:
description: LicenseMasterRef refers to a Splunk Enterprise license
master managed by the operator within Kubernetes
manager managed by the operator within Kubernetes
properties:
apiVersion:
description: API version of the referent.
Expand Down Expand Up @@ -2778,7 +2778,7 @@ spec:
type: boolean
type: object
phase:
description: current phase of the cluster master
description: current phase of the cluster manager
enum:
- Pending
- Ready
Expand Down
10 changes: 5 additions & 5 deletions deploy/crds/enterprise.splunk.com_indexerclusters_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ spec:
description: Full path or URL for one or more defaults.yml files specific
to App install, separated by commas. The defaults listed here will
be installed on the CM, standalone, search head deployer or license
master instance.
manager instance.
type: string
etcVolumeStorageConfig:
description: Storage configuration for /opt/splunk/etc volume
Expand Down Expand Up @@ -837,7 +837,7 @@ spec:
type: string
licenseMasterRef:
description: LicenseMasterRef refers to a Splunk Enterprise license
master managed by the operator within Kubernetes
manager managed by the operator within Kubernetes
properties:
apiVersion:
description: API version of the referent.
Expand Down Expand Up @@ -2475,7 +2475,7 @@ spec:
description: Holds secrets whose IDXC password has changed
type: object
clusterMasterPhase:
description: current phase of the cluster master
description: current phase of the cluster manager
enum:
- Pending
- Ready
Expand Down Expand Up @@ -2511,7 +2511,7 @@ spec:
properties:
active_bundle_id:
description: The ID of the configuration bundle currently being
used by the master.
used by the manager.
type: string
bucket_count:
description: Count of the number of buckets on this peer, across
Expand Down Expand Up @@ -2556,7 +2556,7 @@ spec:
description: selector for pods, used by HorizontalPodAutoscaler
type: string
service_ready_flag:
description: Indicates whether the master is ready to begin servicing,
description: Indicates whether the manager is ready to begin servicing,
based on whether it is initialized.
type: boolean
type: object
Expand Down
16 changes: 8 additions & 8 deletions deploy/crds/enterprise.splunk.com_licensemasters_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ spec:
scope: Namespaced
versions:
- additionalPrinterColumns:
- description: Status of license master
- description: Status of license manager
jsonPath: .status.phase
name: Phase
type: string
- description: Age of license master
- description: Age of license manager
jsonPath: .metadata.creationTimestamp
name: Age
type: date
name: v2
schema:
openAPIV3Schema:
description: LicenseMaster is the Schema for a Splunk Enterprise license master.
description: LicenseMaster is the Schema for a Splunk Enterprise license manager.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -41,7 +41,7 @@ spec:
type: object
spec:
description: LicenseMasterSpec defines the desired state of a Splunk Enterprise
license master.
license manager.
properties:
Mock:
description: Mock to differentiate between UTs and actual reconcile
Expand Down Expand Up @@ -765,7 +765,7 @@ spec:
description: Full path or URL for one or more defaults.yml files specific
to App install, separated by commas. The defaults listed here will
be installed on the CM, standalone, search head deployer or license
master instance.
manager instance.
type: string
etcVolumeStorageConfig:
description: Storage configuration for /opt/splunk/etc volume
Expand Down Expand Up @@ -901,7 +901,7 @@ spec:
type: string
licenseMasterRef:
description: LicenseMasterRef refers to a Splunk Enterprise license
master managed by the operator within Kubernetes
manager managed by the operator within Kubernetes
properties:
apiVersion:
description: API version of the referent.
Expand Down Expand Up @@ -2526,7 +2526,7 @@ spec:
type: object
status:
description: LicenseMasterStatus defines the observed state of a Splunk
Enterprise license master.
Enterprise license manager.
properties:
appContext:
description: App Framework Context
Expand Down Expand Up @@ -2665,7 +2665,7 @@ spec:
type: integer
type: object
phase:
description: current phase of the license master
description: current phase of the license manager
enum:
- Pending
- Ready
Expand Down
4 changes: 2 additions & 2 deletions deploy/crds/enterprise.splunk.com_searchheadclusters_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -778,7 +778,7 @@ spec:
description: Full path or URL for one or more defaults.yml files specific
to App install, separated by commas. The defaults listed here will
be installed on the CM, standalone, search head deployer or license
master instance.
manager instance.
type: string
etcVolumeStorageConfig:
description: Storage configuration for /opt/splunk/etc volume
Expand Down Expand Up @@ -914,7 +914,7 @@ spec:
type: string
licenseMasterRef:
description: LicenseMasterRef refers to a Splunk Enterprise license
master managed by the operator within Kubernetes
manager managed by the operator within Kubernetes
properties:
apiVersion:
description: API version of the referent.
Expand Down
4 changes: 2 additions & 2 deletions deploy/crds/enterprise.splunk.com_standalones_crd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -773,7 +773,7 @@ spec:
description: Full path or URL for one or more defaults.yml files specific
to App install, separated by commas. The defaults listed here will
be installed on the CM, standalone, search head deployer or license
master instance.
manager instance.
type: string
etcVolumeStorageConfig:
description: Storage configuration for /opt/splunk/etc volume
Expand Down Expand Up @@ -909,7 +909,7 @@ spec:
type: string
licenseMasterRef:
description: LicenseMasterRef refers to a Splunk Enterprise license
master managed by the operator within Kubernetes
manager managed by the operator within Kubernetes
properties:
apiVersion:
description: API version of the referent.
Expand Down
Loading