Skip to content

Separate CRD for ClusterMaster & change indexerClusterRef to clusterMasterRef #122

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 14 commits into from
Sep 23, 2020
Merged

Separate CRD for ClusterMaster & change indexerClusterRef to clusterMasterRef #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c013694
Separate CRD for ClusterMaster & change indexerClusterRef to clusterM…
gaurav-splunk Sep 4, 2020
b5406df
Fix merge conflicts
gaurav-splunk Sep 9, 2020
3563b8f
Fix typo
gaurav-splunk Sep 9, 2020
37287f4
fix generated CRDs
gaurav-splunk Sep 9, 2020
76e1fa8
Fix empty value for SPLUNK_INDEXER_URL for CM
gaurav-splunk Sep 14, 2020
fbcc556
Fix unit test for CM
gaurav-splunk Sep 14, 2020
9e0cc75
Remove headless indexer service from ClusterMaster
gaurav-splunk Sep 17, 2020
2381457
Merge branch 'develop' into feature/Cluster_Master_CRD
smohan-splunk Sep 17, 2020
1d8ac4f
Address doc review comments
gaurav-splunk Sep 17, 2020
d5a2f5f
Merge branch 'feature/Cluster_Master_CRD' of github.com:splunk/splunk…
gaurav-splunk Sep 17, 2020
47e3de1
Fixed indentation issue for CRDs with different version of yq
gaurav-splunk Sep 22, 2020
131d6cf
Merge branch 'develop' into feature/Cluster_Master_CRD
gaurav-splunk Sep 22, 2020
1cc8808
Merge branch 'develop' of github.com:splunk/splunk-operator into feat…
gaurav-splunk Sep 23, 2020
a6302b8
Merge branch 'feature/Cluster_Master_CRD' of github.com:splunk/splunk…
gaurav-splunk Sep 23, 2020
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
16 changes: 6 additions & 10 deletions build/package.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,12 @@ rm -f release-${VERSION}/*
docker image save splunk/splunk-operator:${VERSION} | gzip -c > release-${VERSION}/splunk-operator-${VERSION}.tar.gz

echo Generating release-${VERSION}/splunk-operator-crds.yaml
echo "---" > release-${VERSION}/splunk-operator-crds.yaml
cat deploy/crds/enterprise.splunk.com_standalones_crd.yaml >> release-${VERSION}/splunk-operator-crds.yaml
echo "---" >> release-${VERSION}/splunk-operator-crds.yaml
cat deploy/crds/enterprise.splunk.com_licensemasters_crd.yaml >> release-${VERSION}/splunk-operator-crds.yaml
echo "---" >> release-${VERSION}/splunk-operator-crds.yaml
cat deploy/crds/enterprise.splunk.com_searchheadclusters_crd.yaml >> release-${VERSION}/splunk-operator-crds.yaml
echo "---" >> release-${VERSION}/splunk-operator-crds.yaml
cat deploy/crds/enterprise.splunk.com_indexerclusters_crd.yaml >> release-${VERSION}/splunk-operator-crds.yaml
echo "---" >> release-${VERSION}/splunk-operator-crds.yaml
cat deploy/crds/enterprise.splunk.com_sparks_crd.yaml >> release-${VERSION}/splunk-operator-crds.yaml
touch release-${VERSION}/splunk-operator-crds.yaml
for i in `ls deploy/crds/|grep crd.yaml`
do
echo "---" >> release-${VERSION}/splunk-operator-crds.yaml
cat deploy/crds/$i >> release-${VERSION}/splunk-operator-crds.yaml
done

echo Generating release-${VERSION}/splunk-operator-noadmin.yaml
cat deploy/service_account.yaml deploy/role.yaml deploy/role_binding.yaml > release-${VERSION}/splunk-operator-noadmin.yaml
Expand Down
2,309 changes: 2,309 additions & 0 deletions deploy/crds/enterprise.splunk.com_clustermasters_crd.yaml
View file
Open in desktop

Large diffs are not rendered by default.

136 changes: 29 additions & 107 deletions deploy/crds/enterprise.splunk.com_indexerclusters_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,35 +633,8 @@ spec:
type: array
type: object
type: object
defaults:
description: Inline map of default.yml overrides used to initialize
the environment
type: string
defaultsUrl:
description: Full path or URL for one or more default.yml files, separated
by commas
type: string
ephemeralStorage:
description: If true, ephemeral (emptyDir) storage will be used for
/opt/splunk/etc and /opt/splunk/var volumes
type: boolean
etcStorage:
description: Storage capacity to request for /opt/splunk/etc persistent
volume claims (default=”1Gi”)
type: string
image:
description: Image to use for Splunk pod containers (overrides RELATED_IMAGE_SPLUNK_ENTERPRISE
environment variables)
type: string
imagePullPolicy:
description: 'Sets pull policy for all images (either “Always” or the
default: “IfNotPresent”)'
enum:
- Always
- IfNotPresent
type: string
indexerClusterRef:
description: IndexerClusterRef refers to a Splunk Enterprise indexer
clusterMasterRef:
description: ClusterMasterRef refers to a Splunk Enterprise indexer
cluster managed by the operator within Kubernetes
properties:
apiVersion:
Expand Down Expand Up @@ -697,6 +670,33 @@ spec:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
defaults:
description: Inline map of default.yml overrides used to initialize
the environment
type: string
defaultsUrl:
description: Full path or URL for one or more default.yml files, separated
by commas
type: string
ephemeralStorage:
description: If true, ephemeral (emptyDir) storage will be used for
/opt/splunk/etc and /opt/splunk/var volumes
type: boolean
etcStorage:
description: Storage capacity to request for /opt/splunk/etc persistent
volume claims (default=”1Gi”)
type: string
image:
description: Image to use for Splunk pod containers (overrides RELATED_IMAGE_SPLUNK_ENTERPRISE
environment variables)
type: string
imagePullPolicy:
description: 'Sets pull policy for all images (either “Always” or the
default: “IfNotPresent”)'
enum:
- Always
- IfNotPresent
type: string
licenseMasterRef:
description: LicenseMasterRef refers to a Splunk Enterprise license
master managed by the operator within Kubernetes
Expand Down Expand Up @@ -1002,45 +1002,6 @@ spec:
type: object
type: object
type: object
smartstore:
description: Splunk Smartstore configuration. Refer to indexes.conf.spec
on docs.splunk.com
properties:
indexes:
description: List of Splunk indexes
items:
description: IndexSpec defines Splunk index name and storage path
properties:
name:
description: Splunk index name
type: string
remotePath:
description: Index location relative to the remote volume
path
type: string
volumeName:
description: Remote Volume name
type: string
type: object
type: array
volumes:
description: List of remote storage volumes
items:
description: VolumeSpec defines remote volume name and remote
volume URI
properties:
endpoint:
description: Remote volume URI
type: string
name:
description: Remote volume name
type: string
path:
description: Remote volume path
type: string
type: object
type: array
type: object
storageClassName:
description: Name of StorageClass to use for persistent volume claims
type: string
Expand Down Expand Up @@ -2348,45 +2309,6 @@ spec:
description: Indicates whether the master is ready to begin servicing,
based on whether it is initialized.
type: boolean
smartstore:
description: Splunk Smartstore configuration. Refer to indexes.conf.spec
on docs.splunk.com
properties:
indexes:
description: List of Splunk indexes
items:
description: IndexSpec defines Splunk index name and storage path
properties:
name:
description: Splunk index name
type: string
remotePath:
description: Index location relative to the remote volume
path
type: string
volumeName:
description: Remote Volume name
type: string
type: object
type: array
volumes:
description: List of remote storage volumes
items:
description: VolumeSpec defines remote volume name and remote
volume URI
properties:
endpoint:
description: Remote volume URI
type: string
name:
description: Remote volume name
type: string
path:
description: Remote volume path
type: string
type: object
type: array
type: object
type: object
type: object
version: v1alpha3
Expand Down
58 changes: 29 additions & 29 deletions deploy/crds/enterprise.splunk.com_licensemasters_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,35 +616,8 @@ spec:
type: array
type: object
type: object
defaults:
description: Inline map of default.yml overrides used to initialize
the environment
type: string
defaultsUrl:
description: Full path or URL for one or more default.yml files, separated
by commas
type: string
ephemeralStorage:
description: If true, ephemeral (emptyDir) storage will be used for
/opt/splunk/etc and /opt/splunk/var volumes
type: boolean
etcStorage:
description: Storage capacity to request for /opt/splunk/etc persistent
volume claims (default=”1Gi”)
type: string
image:
description: Image to use for Splunk pod containers (overrides RELATED_IMAGE_SPLUNK_ENTERPRISE
environment variables)
type: string
imagePullPolicy:
description: 'Sets pull policy for all images (either “Always” or the
default: “IfNotPresent”)'
enum:
- Always
- IfNotPresent
type: string
indexerClusterRef:
description: IndexerClusterRef refers to a Splunk Enterprise indexer
clusterMasterRef:
description: ClusterMasterRef refers to a Splunk Enterprise indexer
cluster managed by the operator within Kubernetes
properties:
apiVersion:
Expand Down Expand Up @@ -680,6 +653,33 @@ spec:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
defaults:
description: Inline map of default.yml overrides used to initialize
the environment
type: string
defaultsUrl:
description: Full path or URL for one or more default.yml files, separated
by commas
type: string
ephemeralStorage:
description: If true, ephemeral (emptyDir) storage will be used for
/opt/splunk/etc and /opt/splunk/var volumes
type: boolean
etcStorage:
description: Storage capacity to request for /opt/splunk/etc persistent
volume claims (default=”1Gi”)
type: string
image:
description: Image to use for Splunk pod containers (overrides RELATED_IMAGE_SPLUNK_ENTERPRISE
environment variables)
type: string
imagePullPolicy:
description: 'Sets pull policy for all images (either “Always” or the
default: “IfNotPresent”)'
enum:
- Always
- IfNotPresent
type: string
licenseMasterRef:
description: LicenseMasterRef refers to a Splunk Enterprise license
master managed by the operator within Kubernetes
Expand Down
58 changes: 29 additions & 29 deletions deploy/crds/enterprise.splunk.com_searchheadclusters_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,35 +633,8 @@ spec:
type: array
type: object
type: object
defaults:
description: Inline map of default.yml overrides used to initialize
the environment
type: string
defaultsUrl:
description: Full path or URL for one or more default.yml files, separated
by commas
type: string
ephemeralStorage:
description: If true, ephemeral (emptyDir) storage will be used for
/opt/splunk/etc and /opt/splunk/var volumes
type: boolean
etcStorage:
description: Storage capacity to request for /opt/splunk/etc persistent
volume claims (default=”1Gi”)
type: string
image:
description: Image to use for Splunk pod containers (overrides RELATED_IMAGE_SPLUNK_ENTERPRISE
environment variables)
type: string
imagePullPolicy:
description: 'Sets pull policy for all images (either “Always” or the
default: “IfNotPresent”)'
enum:
- Always
- IfNotPresent
type: string
indexerClusterRef:
description: IndexerClusterRef refers to a Splunk Enterprise indexer
clusterMasterRef:
description: ClusterMasterRef refers to a Splunk Enterprise indexer
cluster managed by the operator within Kubernetes
properties:
apiVersion:
Expand Down Expand Up @@ -697,6 +670,33 @@ spec:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
type: string
type: object
defaults:
description: Inline map of default.yml overrides used to initialize
the environment
type: string
defaultsUrl:
description: Full path or URL for one or more default.yml files, separated
by commas
type: string
ephemeralStorage:
description: If true, ephemeral (emptyDir) storage will be used for
/opt/splunk/etc and /opt/splunk/var volumes
type: boolean
etcStorage:
description: Storage capacity to request for /opt/splunk/etc persistent
volume claims (default=”1Gi”)
type: string
image:
description: Image to use for Splunk pod containers (overrides RELATED_IMAGE_SPLUNK_ENTERPRISE
environment variables)
type: string
imagePullPolicy:
description: 'Sets pull policy for all images (either “Always” or the
default: “IfNotPresent”)'
enum:
- Always
- IfNotPresent
type: string
licenseMasterRef:
description: LicenseMasterRef refers to a Splunk Enterprise license
master managed by the operator within Kubernetes
Expand Down
Loading