Merge pull request #371 from splunk/develop

Release/8.0.4
splunk · May 23, 2020 · 1283bba · 1283bba
2 parents 6d8ada9 + a2b56b4
commit 1283bba
Show file tree

Hide file tree

Showing 7 changed files with 575 additions and 12 deletions.
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -7,7 +7,7 @@
 
 # Default owners for everything in docker-splunk:
 # *       @splunk/if-01
-*       @nwang92 @alishamayor @arctan5x @lephino @jrigassio-splunk @jmeixensperger @hendolim @jonathan-vega-splunk
+*       @nwang92 @alishamayor @arctan5x @lephino @jrigassio-splunk @jmeixensperger @hendolim @jonathan-vega-splunk @bb03
 
 # Docs-only pull requests:
-/docs/  @alishamayor @nwang92
+/docs/  @alishamayor @nwang92 @bb03
diff --git a/Makefile b/Makefile
@@ -7,8 +7,8 @@ SPLUNK_ANSIBLE_BRANCH ?= develop
 SPLUNK_COMPOSE ?= cluster_absolute_unit.yaml
 # Set Splunk version/build parameters here to define downstream URLs and file names
 SPLUNK_PRODUCT := splunk
-SPLUNK_VERSION := 8.0.3
-SPLUNK_BUILD := a6754d8441bf
+SPLUNK_VERSION := 8.0.4
+SPLUNK_BUILD := 767223ac207f
 ifeq ($(shell arch), s390x)
 	SPLUNK_ARCH = s390x
 else

diff --git a/base/redhat-8/Dockerfile b/base/redhat-8/Dockerfile
@@ -16,7 +16,7 @@
 # the container catalog moved from registry.access.redhat.com to registry.redhat.io
 # So at some point before they deprecate the old registry we have to make sure that
 # we have access to the new registry and change where we pull the ubi image from.
-FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1-407
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.1-409
 LABEL name="splunk" \
       maintainer="support@splunk.com" \
       vendor="splunk" \

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Navigation
 
+* [8.0.4](#804)
 * [8.0.3](#803)
 * [8.0.2.1](#8021)
 * [8.0.2](#802)
@@ -30,6 +31,28 @@
 
 ---
 
+## 8.0.4
+
+#### What's New?
+* Releasing new images to support Splunk Enterprise maintenance patch.
+
+#### docker-splunk changes:
+* Bumping Splunk version. For details, see [Fixed issues](https://docs.splunk.com/Documentation/Splunk/8.0.4/ReleaseNotes/Fixedissues) in 8.0.4.
+* Additional tests for new features
+
+#### splunk-ansible changes:
+* Support for custom SSL certificates for the Splunkd management endpoint
+* 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:
+    * `splunk.appserver.port`, `splunk.kvstore.port` in `default.yml`
+    * `SPLUNK_APPSERVER_PORT`, `SPLUNK_KVSTORE_PORT` environment variables
+* Java installation through `default.yml` with `java_download_url`, `java_update_version`, and `java_version`
+* Support for Windows+AWS deployments for Splunk v7.2 and v7.3
+* Set pass4SymmKey for indexer discovery separately from pass4SymmKey for indexer clustering with:
+    * `splunk.idxc.discoveryPass4SymmKey` in `default.yml`
+    * `SPLUNK_IDXC_DISCOVERYPASS4SYMMKEY` environment variable
+
+---
+
 ## 8.0.3
 
 #### What's New?

diff --git a/docs/SUPPORT.md b/docs/SUPPORT.md
@@ -21,6 +21,8 @@ The following prerequisites and dependencies must be installed on each node you
 * Docker engine:
     * Docker Enterprise Engine 17.06.2 or higher
     * Docker Community Engine 17.06.2 or higher
+
+        **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.
 * [OverlayFS](https://docs.docker.com/storage/storagedriver/overlayfs-driver/) `overlay2` Docker daemon storage driver
     1. Edit `/etc/docker/daemon.json`. If it does not yet exist, create it.
     2. Assuming the file was empty, add the following contents:

diff --git a/py23-image/redhat-8/Dockerfile b/py23-image/redhat-8/Dockerfile
@@ -17,6 +17,7 @@ RUN wget https://www.python.org/ftp/python/3.7.4/Python-3.7.4.tgz \
     && python3.7 get-pip.py \
     && rm -f get-pip.py \
     #pip version is not automatically "fixed", unlike debian-based
+    && ln -sf /usr/bin/python2 /usr/bin/python \
     && ln -sf /usr/bin/pip2 /usr/bin/pip \
     && ln -sf /usr/bin/pip3.7 /usr/bin/pip3
 #microdnf persists metadata which is a problem for removing packages. So have to clean first before removing.