Skip to content
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

[Draft]: CSPL-2600: Integrate HashiCorp Vault Support in Splunk Operator #1388

Open
wants to merge 12 commits into
base: CSPL-2601
Choose a base branch
from
Open

[Draft]: CSPL-2600: Integrate HashiCorp Vault Support in Splunk Operator #1388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1a61128
adding logic to support vault
Oct 15, 2024
b70767a
Merge branch 'cspl-2601' into cspl-2600
Oct 15, 2024
c887b65
unit test
Oct 15, 2024
fe4d40c
adding secret monitor sidecar
Oct 17, 2024
e83b4a2
adding vault access code base
Oct 18, 2024
ad992f7
adding api changes
Oct 18, 2024
c905358
some doc changes
Oct 18, 2024
db0f05a
working code for standalone
Oct 18, 2024
b9b97de
working c3 changes
Oct 22, 2024
eb2d5fc
get token from vault
Oct 24, 2024
d2b7971
added vault secret validation
Oct 25, 2024
418976a
go lib changes
Oct 25, 2024
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
2 changes: 1 addition & 1 deletion .env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ AWSCLI_URL=https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.8.6.zip
KUBECTL_VERSION=v1.29.1
AZ_CLI_VERSION=2.30.0
EKSCTL_VERSION=v0.143.0
EKS_CLUSTER_K8_VERSION=1.27
EKS_CLUSTER_K8_VERSION=1.31
SPLUNK_ENTERPRISE_RELEASE_IMAGE=splunk/splunk:9.3.0
19 changes: 19 additions & 0 deletions api/v4/common_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,8 @@ type CommonSplunkSpec struct {
// Sets imagePullSecrets if image is being pulled from a private registry.
// See https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
ImagePullSecrets []corev1.LocalObjectReference `json:"imagePullSecrets,omitempty"`

VaultIntegration VaultIntegration `json:"vaultIntegration,omitempty"`
}

// StorageClassSpec defines storage class configuration
Expand Down Expand Up @@ -569,6 +571,23 @@ type PhaseInfo struct {
FailCount uint32 `json:"failCount,omitempty"`
}

// Vault represents the Vault configuration for enabling secret injection.
// +kubebuilder:object:generate=true
// +kubebuilder:validation:Optional
type VaultIntegration struct {
// Enable vault support
Enable bool `json:"enable,omitempty"`

// Vault Address
Address string `json:"address"`

// Vault Role
Role string `json:"role"`

// Vault secret path
SecretPath string `json:"secretPath"`
}

const (
// AppPkgDownloadPending indicates pending
AppPkgDownloadPending AppPhaseStatusType = 101
Expand Down
16 changes: 16 additions & 0 deletions api/v4/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.

19 changes: 18 additions & 1 deletion config/crd/bases/enterprise.splunk.com_clustermanagers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: (devel)
name: clustermanagers.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down Expand Up @@ -2360,6 +2360,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down
19 changes: 18 additions & 1 deletion config/crd/bases/enterprise.splunk.com_clustermasters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: (devel)
name: clustermasters.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down Expand Up @@ -2356,6 +2356,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down
36 changes: 35 additions & 1 deletion config/crd/bases/enterprise.splunk.com_indexerclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: (devel)
name: indexerclusters.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down Expand Up @@ -2096,6 +2096,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down Expand Up @@ -5871,6 +5888,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down
19 changes: 18 additions & 1 deletion config/crd/bases/enterprise.splunk.com_licensemanagers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: (devel)
name: licensemanagers.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down Expand Up @@ -2233,6 +2233,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down
19 changes: 18 additions & 1 deletion config/crd/bases/enterprise.splunk.com_licensemasters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: (devel)
name: licensemasters.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down Expand Up @@ -2228,6 +2228,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down
36 changes: 35 additions & 1 deletion config/crd/bases/enterprise.splunk.com_monitoringconsoles.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: (devel)
name: monitoringconsoles.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down Expand Up @@ -2235,6 +2235,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down Expand Up @@ -6354,6 +6371,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down
36 changes: 35 additions & 1 deletion config/crd/bases/enterprise.splunk.com_searchheadclusters.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.16.1
controller-gen.kubebuilder.io/version: (devel)
name: searchheadclusters.enterprise.splunk.com
spec:
group: enterprise.splunk.com
Expand Down Expand Up @@ -2246,6 +2246,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down Expand Up @@ -6452,6 +6469,23 @@ spec:
claims
type: string
type: object
vaultIntegration:
description: Vault represents the Vault configuration for enabling
secret injection.
properties:
address:
description: Vault Address
type: string
enable:
description: Enable vault support
type: boolean
role:
description: Vault Role
type: string
secretPath:
description: Vault secret path
type: string
type: object
volumes:
description: List of one or more Kubernetes volumes. These will be
mounted in all pod containers as as /mnt/<name>
Expand Down
Loading
Loading