Skip to content

Commit ec70737

Browse files
Merge pull request #290 from splunk/release/1.0.0-RC
CSPL-929 - Upgrade Operator version to 1.0.0-RC
2 parents 3f87bb6 + 40ac139 commit ec70737

13 files changed

+33
-123
lines changed

deploy/olm-catalog/splunk/1.0.0/enterprise.splunk.com_clustermasters_crd.yaml renamed to deploy/olm-catalog/splunk/1.0.0-RC/enterprise.splunk.com_clustermasters_crd.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,12 +1098,6 @@ spec:
10981098
type: object
10991099
type: array
11001100
type: object
1101-
sparkImage:
1102-
description: Image to use for Spark pod containers (overrides RELATED_IMAGE_SPLUNK_SPARK
1103-
environment variables). Also used on cluster master for init container
1104-
to setup the soft links from ../master-apps/splunk-operator/local/
1105-
to /mnt/splunk-operator/local/
1106-
type: string
11071101
tolerations:
11081102
description: Pod's tolerations for Kubernetes node's taint
11091103
items:

deploy/olm-catalog/splunk/1.0.0/enterprise.splunk.com_searchheadclusters_crd.yaml renamed to deploy/olm-catalog/splunk/1.0.0-RC/enterprise.splunk.com_searchheadclusters_crd.yaml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1022,48 +1022,6 @@ spec:
10221022
type: object
10231023
type: object
10241024
type: object
1025-
sparkImage:
1026-
description: Image to use for Spark pod containers (overrides RELATED_IMAGE_SPLUNK_SPARK
1027-
environment variables)
1028-
type: string
1029-
sparkRef:
1030-
description: SparkRef refers to a Spark cluster managed by the operator
1031-
within Kubernetes When defined, Data Fabric Search (DFS) will be enabled
1032-
and configured to use the Spark cluster.
1033-
properties:
1034-
apiVersion:
1035-
description: API version of the referent.
1036-
type: string
1037-
fieldPath:
1038-
description: 'If referring to a piece of an object instead of an
1039-
entire object, this string should contain a valid JSON/Go field
1040-
access statement, such as desiredState.manifest.containers[2].
1041-
For example, if the object reference is to a container within
1042-
a pod, this would take on a value like: "spec.containers{name}"
1043-
(where "name" refers to the name of the container that triggered
1044-
the event) or if no container name is specified "spec.containers[2]"
1045-
(container with index 2 in this pod). This syntax is chosen only
1046-
to have some well-defined way of referencing a part of an object.
1047-
TODO: this design is not final and this field is subject to change
1048-
in the future.'
1049-
type: string
1050-
kind:
1051-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
1052-
type: string
1053-
name:
1054-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
1055-
type: string
1056-
namespace:
1057-
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
1058-
type: string
1059-
resourceVersion:
1060-
description: 'Specific resourceVersion to which this reference is
1061-
made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
1062-
type: string
1063-
uid:
1064-
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
1065-
type: string
1066-
type: object
10671025
tolerations:
10681026
description: Pod's tolerations for Kubernetes node's taint
10691027
items:

deploy/olm-catalog/splunk/1.0.0/enterprise.splunk.com_standalones_crd.yaml renamed to deploy/olm-catalog/splunk/1.0.0-RC/enterprise.splunk.com_standalones_crd.yaml

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1119,48 +1119,6 @@ spec:
11191119
type: object
11201120
type: array
11211121
type: object
1122-
sparkImage:
1123-
description: Image to use for Spark pod containers (overrides RELATED_IMAGE_SPLUNK_SPARK
1124-
environment variables)
1125-
type: string
1126-
sparkRef:
1127-
description: SparkRef refers to a Spark cluster managed by the operator
1128-
within Kubernetes When defined, Data Fabric Search (DFS) will be enabled
1129-
and configured to use the Spark cluster.
1130-
properties:
1131-
apiVersion:
1132-
description: API version of the referent.
1133-
type: string
1134-
fieldPath:
1135-
description: 'If referring to a piece of an object instead of an
1136-
entire object, this string should contain a valid JSON/Go field
1137-
access statement, such as desiredState.manifest.containers[2].
1138-
For example, if the object reference is to a container within
1139-
a pod, this would take on a value like: "spec.containers{name}"
1140-
(where "name" refers to the name of the container that triggered
1141-
the event) or if no container name is specified "spec.containers[2]"
1142-
(container with index 2 in this pod). This syntax is chosen only
1143-
to have some well-defined way of referencing a part of an object.
1144-
TODO: this design is not final and this field is subject to change
1145-
in the future.'
1146-
type: string
1147-
kind:
1148-
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
1149-
type: string
1150-
name:
1151-
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
1152-
type: string
1153-
namespace:
1154-
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
1155-
type: string
1156-
resourceVersion:
1157-
description: 'Specific resourceVersion to which this reference is
1158-
made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
1159-
type: string
1160-
uid:
1161-
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
1162-
type: string
1163-
type: object
11641122
tolerations:
11651123
description: Pod's tolerations for Kubernetes node's taint
11661124
items:

deploy/olm-catalog/splunk/1.0.0/splunk.v1.0.0.clusterserviceversion.yaml renamed to deploy/olm-catalog/splunk/1.0.0-RC/splunk.v1.0.0-RC.clusterserviceversion.yaml

Lines changed: 7 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -34,16 +34,6 @@ metadata:
3434
"replicas": 1
3535
}
3636
},
37-
{
38-
"apiVersion": "enterprise.splunk.com/v1",
39-
"kind": "Spark",
40-
"metadata": {
41-
"name": "example"
42-
},
43-
"spec": {
44-
"replicas": 1
45-
}
46-
},
4737
{
4838
"apiVersion": "enterprise.splunk.com/v1",
4939
"kind": "Standalone",
@@ -54,7 +44,7 @@ metadata:
5444
"spec": {}
5545
}]
5646
capabilities: Basic Install
57-
name: splunk.v1.0.0
47+
name: splunk.v1.0.0-RC
5848
namespace: placeholder
5949
spec:
6050
apiservicedefinitions: {}
@@ -132,10 +122,9 @@ spec:
132122
version: v1
133123
- kind: Secrets
134124
version: v1
135-
displayName: Spark
136-
- description: Spark is the Schema for a Spark cluster
137-
kind: Spark
138-
name: sparks.enterprise.splunk.com
125+
- description: Standalone is the Schema for a Splunk Enterprise standalone instances.
126+
kind: Standalone
127+
name: standalones.enterprise.splunk.com
139128
version: v1
140129
resources:
141130
- kind: StatefulSets
@@ -151,10 +140,6 @@ spec:
151140
- kind: Secrets
152141
version: v1
153142
displayName: Standalone
154-
- description: Standalone is the Schema for a Splunk Enterprise standalone instances.
155-
kind: Standalone
156-
name: standalones.enterprise.splunk.com
157-
version: v1
158143
description: Placeholder description
159144
displayName: Splunk
160145
install:
@@ -185,10 +170,8 @@ spec:
185170
- name: OPERATOR_NAME
186171
value: splunk-operator
187172
- name: RELATED_IMAGE_SPLUNK_ENTERPRISE
188-
value: docker.io/splunk/splunk:8.1.2
189-
- name: RELATED_IMAGE_SPLUNK_SPARK
190-
value: docker.io/splunk/spark:0.0.2
191-
image: docker.io/splunk/splunk-operator:1.0.0
173+
value: docker.io/splunk/splunk:8.1.3
174+
image: docker.io/splunk/splunk-operator:1.0.0-RC
192175
imagePullPolicy: IfNotPresent
193176
name: splunk-operator
194177
resources: {}
@@ -259,4 +242,4 @@ spec:
259242
maturity: alpha
260243
provider: {}
261244
replaces: splunk.v0.0.0
262-
version: 1.0.0
245+
version: 1.0.0-RC

deploy/operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@ spec:
3030
- name: OPERATOR_NAME
3131
value: "splunk-operator"
3232
- name: RELATED_IMAGE_SPLUNK_ENTERPRISE
33-
value: "docker.io/splunk/splunk:8.1.2"
33+
value: "docker.io/splunk/splunk:8.1.3"

docs/ChangeLog.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Splunk Operator for Kubernetes Change Log
22

3+
## 1.0.0-RC (2021-03-22)
4+
* This a release candidate for upcoming GA release.
5+
6+
* This release depends upon changes made concurrently in the Splunk Enterprise container images. You should use the splunk/splunk:8.1.3 image with it
7+
8+
* Changed CRD version from v1beta1 to v1, 1.0.0-RC operator version
9+
10+
* CSPL-826 - Created documentation detailing secure Splunk deployments in Kubernetes.
11+
12+
* CSPL-674 - Removed Spark support
13+
14+
* CSPL-624 - Added Splunk Operator upgrade documentation
15+
16+
* Security enhancements
17+
18+
* Test automation enhancements
19+
320
## 0.2.2 Beta(2021-02-09)
421
* This release depends upon changes made concurrently in the Splunk Enterprise container images. You should use the splunk/splunk:8.1.2 image with it, or alternatively any release version 8.1.0 or later
522

docs/Ingress.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ http://<LoadBalance-External-IP>
114114

115115
#### Multiple Hosts Configuration
116116

117-
If your deployment has multiple hosts such as Search Heads and Cluster Master, use this example to configure Splunk Web access, and HTTP Event Collector port. Follow the steps here [HEC Documentation](https://docs.splunk.com/Documentation/Splunk/8.1.2/Data/UsetheHTTPEventCollector) to learn how to create a HEC token and how to send data using HTTP.
117+
If your deployment has multiple hosts such as Search Heads and Cluster Master, use this example to configure Splunk Web access, and HTTP Event Collector port. Follow the steps here [HEC Documentation](https://docs.splunk.com/Documentation/Splunk/latest/Data/UsetheHTTPEventCollector) to learn how to create a HEC token and how to send data using HTTP.
118118

119119
1. Create a Gateway for multiple hosts.
120120

docs/Install.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
If you want to customize the installation of the Splunk Operator, download a copy of the installation YAML locally, and open it in your favorite editor.
88

99
```
10-
wget -O splunk-operator.yaml https://github.com/splunk/splunk-operator/releases/download/0.2.2/splunk-operator-install.yaml
10+
wget -O splunk-operator.yaml https://github.com/splunk/splunk-operator/releases/download/1.0.0-RC/splunk-operator-install.yaml
1111
```
1212

1313

@@ -18,13 +18,13 @@ Kubernetes only allows administrators to install new `CustomResourceDefinition`
1818
If you are not an administrator, you can have an administrator create the required objects for you by running:
1919

2020
```
21-
kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/0.2.2/splunk-operator-crds.yaml
21+
kubectl apply -f https://github.com/splunk/splunk-operator/releases/download/1.0.0-RC/splunk-operator-crds.yaml
2222
```
2323

2424
Afterwards, you can download and use the yaml file to install the operator within your own namespace:
2525

2626
```
27-
wget -O splunk-operator.yaml https://github.com/splunk/splunk-operator/releases/download/0.2.2/splunk-operator-noadmin.yaml
27+
wget -O splunk-operator.yaml https://github.com/splunk/splunk-operator/releases/download/1.0.0-RC/splunk-operator-noadmin.yaml
2828
kubectl config set-context --current --namespace=<NAMESPACE>
2929
kubectl apply -f splunk-operator.yaml
3030
```
@@ -35,7 +35,7 @@ kubectl apply -f splunk-operator.yaml
3535
If you want to configure a single instance of the operator to manage all the namespaces of your cluster, use the alternative cluster scope installation yaml file:
3636

3737
```
38-
wget -O splunk-operator.yaml https://github.com/splunk/splunk-operator/releases/download/0.2.2/splunk-operator-cluster.yaml
38+
wget -O splunk-operator.yaml https://github.com/splunk/splunk-operator/releases/download/1.0.0-RC/splunk-operator-cluster.yaml
3939
```
4040

4141
When running at cluster scope, you will need to bind the `splunk:operator:namespace-manager` ClusterRole to the `splunk-operator` ServiceAccount in all namespaces you want it to manage.

0 commit comments

Comments
 (0)