Skip to content

Commit 1283bba

Browse files
authored
Merge pull request #371 from splunk/develop
Release/8.0.4
2 parents 6d8ada9 + a2b56b4 commit 1283bba

File tree

7 files changed

+575
-12
lines changed

7 files changed

+575
-12
lines changed

CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
# Default owners for everything in docker-splunk:
99
# * @splunk/if-01
10-
* @nwang92 @alishamayor @arctan5x @lephino @jrigassio-splunk @jmeixensperger @hendolim @jonathan-vega-splunk
10+
* @nwang92 @alishamayor @arctan5x @lephino @jrigassio-splunk @jmeixensperger @hendolim @jonathan-vega-splunk @bb03
1111

1212
# Docs-only pull requests:
13-
/docs/ @alishamayor @nwang92
13+
/docs/ @alishamayor @nwang92 @bb03

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ SPLUNK_ANSIBLE_BRANCH ?= develop
77
SPLUNK_COMPOSE ?= cluster_absolute_unit.yaml
88
# Set Splunk version/build parameters here to define downstream URLs and file names
99
SPLUNK_PRODUCT := splunk
10-
SPLUNK_VERSION := 8.0.3
11-
SPLUNK_BUILD := a6754d8441bf
10+
SPLUNK_VERSION := 8.0.4
11+
SPLUNK_BUILD := 767223ac207f
1212
ifeq ($(shell arch), s390x)
1313
SPLUNK_ARCH = s390x
1414
else

base/redhat-8/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# the container catalog moved from registry.access.redhat.com to registry.redhat.io
1717
# So at some point before they deprecate the old registry we have to make sure that
1818
# we have access to the new registry and change where we pull the ubi image from.
19-
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1-407
19+
FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1-409
2020
LABEL name="splunk" \
2121
maintainer="[email protected]" \
2222
vendor="splunk" \

docs/CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
## Navigation
44

5+
* [8.0.4](#804)
56
* [8.0.3](#803)
67
* [8.0.2.1](#8021)
78
* [8.0.2](#802)
@@ -30,6 +31,28 @@
3031

3132
---
3233

34+
## 8.0.4
35+
36+
#### What's New?
37+
* Releasing new images to support Splunk Enterprise maintenance patch.
38+
39+
#### docker-splunk changes:
40+
* Bumping Splunk version. For details, see [Fixed issues](https://docs.splunk.com/Documentation/Splunk/8.0.4/ReleaseNotes/Fixedissues) in 8.0.4.
41+
* Additional tests for new features
42+
43+
#### splunk-ansible changes:
44+
* Support for custom SSL certificates for the Splunkd management endpoint
45+
* Support for custom ports for [Splunk Application Server](https://docs.splunk.com/Documentation/ITSI/latest/IModules/AboutApplicationServerModule) and [App KV Store](https://docs.splunk.com/Documentation/Splunk/latest/Admin/AboutKVstore) using:
46+
* `splunk.appserver.port`, `splunk.kvstore.port` in `default.yml`
47+
* `SPLUNK_APPSERVER_PORT`, `SPLUNK_KVSTORE_PORT` environment variables
48+
* Java installation through `default.yml` with `java_download_url`, `java_update_version`, and `java_version`
49+
* Support for Windows+AWS deployments for Splunk v7.2 and v7.3
50+
* Set pass4SymmKey for indexer discovery separately from pass4SymmKey for indexer clustering with:
51+
* `splunk.idxc.discoveryPass4SymmKey` in `default.yml`
52+
* `SPLUNK_IDXC_DISCOVERYPASS4SYMMKEY` environment variable
53+
54+
---
55+
3356
## 8.0.3
3457

3558
#### What's New?

docs/SUPPORT.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ The following prerequisites and dependencies must be installed on each node you
2121
* Docker engine:
2222
* Docker Enterprise Engine 17.06.2 or higher
2323
* Docker Community Engine 17.06.2 or higher
24+
25+
**Note:** If you are using [podman](https://github.com/containers/libpod), [CRI-O](https://github.com/cri-o/cri-o), [containerd](https://github.com/containerd/containerd) or other container runtimes, please be aware that these are currently outside of our support/testing matrix. It's possible that this Docker image still works, although you may need to manually add the environment variable `KUBERNETES_SERVICE_HOST=kubernetes` to configure the provisioning hooks properly.
2426
* [OverlayFS](https://docs.docker.com/storage/storagedriver/overlayfs-driver/) `overlay2` Docker daemon storage driver
2527
1. Edit `/etc/docker/daemon.json`. If it does not yet exist, create it.
2628
2. Assuming the file was empty, add the following contents:

py23-image/redhat-8/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ RUN wget https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tgz \
1717
&& python3.7 get-pip.py \
1818
&& rm -f get-pip.py \
1919
#pip version is not automatically "fixed", unlike debian-based
20+
&& ln -sf /usr/bin/python2 /usr/bin/python \
2021
&& ln -sf /usr/bin/pip2 /usr/bin/pip \
2122
&& ln -sf /usr/bin/pip3.7 /usr/bin/pip3
2223
#microdnf persists metadata which is a problem for removing packages. So have to clean first before removing.

0 commit comments

Comments
 (0)