Develop to main doc change (#1056)

* k8s supported version updated to 1.20+ Signed-off-by: vivekr-splunk <[email protected]> * Fix the splunk image switch on main branch (#1050) Co-authored-by: gaurav-splunk <[email protected]> Co-authored-by: vivekr-splunk <[email protected]> * Fix documentation which indicated ES being unsupported (#1054) Co-authored-by: vivekr-splunk <[email protected]> --------- Signed-off-by: vivekr-splunk <[email protected]> Co-authored-by: gaurav-splunk <[email protected]> Co-authored-by: vivekr-splunk <[email protected]> Co-authored-by: Arjun Kondur <[email protected]>
splunk · Feb 8, 2023 · f910f6c · f910f6c
1 parent 3e18e16
commit f910f6c
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/.github/workflows/build-test-push-workflow.yml b/.github/workflows/build-test-push-workflow.yml
@@ -126,7 +126,14 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test: [basic, appframeworks1, managerappframeworkc3, managerappframeworkm4, managersecret, managermc, masterappframeworkc3, masterappframeworkm4, mastersecret, mastermc]
+        test: [
+                basic,
+                appframeworks1,
+                managerappframeworkc3,
+                managerappframeworkm4,
+                managersecret,
+                managermc,
+               ]
     runs-on: ubuntu-latest
     env:
       CLUSTER_NODES: 1
@@ -158,6 +165,10 @@ jobs:
       - name: Dotenv Action
         id: dotenv
         uses: falti/dotenv-action@d4d12eaa0e1dd06d5bdc3d7af3bf4c8c93cb5359
+      - name: Change splunk enterprise to release image on main branches
+        if: github.ref == 'refs/heads/main'
+        run: |
+          echo "SPLUNK_ENTERPRISE_IMAGE=${{ env.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV
       - name: Install Kubectl
         uses: Azure/setup-kubectl@v1
         with:

diff --git a/.github/workflows/int-test-workflow.yml b/.github/workflows/int-test-workflow.yml
@@ -4,6 +4,7 @@ on:
     branches:
       - develop
       - main
+      - feature**
 jobs:
   build-operator-image:
     runs-on: ubuntu-latest
@@ -61,13 +62,6 @@ jobs:
             managermc,
             managercrcrud,
             licensemanager,
-            masterappframeworkc3,
-            masterappframeworkm4,
-            mastersecret,
-            mastersmartstore,
-            mastermc,
-            mastercrcrud,
-            licensemaster,
             managerdeletecr,
           ]
     runs-on: ubuntu-latest
@@ -104,7 +98,7 @@ jobs:
             echo "CLUSTER_NODES=2" >> $GITHUB_ENV
           fi
       - name: Change splunk enterprise to release image on main branches
-        if: github.ref == 'ref/head/main'
+        if: github.ref == 'refs/heads/main'
         run: |
           echo "SPLUNK_ENTERPRISE_IMAGE=${{ env.SPLUNK_ENTERPRISE_RELEASE_IMAGE }}" >> $GITHUB_ENV
       - name: Checkcout code

diff --git a/bundle/manifests/splunk-operator.clusterserviceversion.yaml b/bundle/manifests/splunk-operator.clusterserviceversion.yaml
@@ -248,7 +248,7 @@ spec:
     splunk/splunk-operator\n\n\n## Known Issues for the Splunk Operator\n\nReview
     the [Change Log](https://github.com/splunk/splunk-operator/blob/master/docs/ChangeLog.md)
     page for a history of changes in each release.\n\n## Prerequisites for the Splunk
-    Operator\n\n### Supported Kubernetes Versions\n\n- Kubernetes, version 1.16.2+
+    Operator\n\n### Supported Kubernetes Versions\n\n- Kubernetes, version 1.20+
     and later (x86 64-bit only).\n\nThe Splunk Operator should work with any [CNCF
     certified distribution](https://www.cncf.io/certification/software-conformance/)
     of Kubernetes. We do not have platform recommendations, but this is a table of

diff --git a/config/manifests/bases/splunk-operator.clusterserviceversion.yaml b/config/manifests/bases/splunk-operator.clusterserviceversion.yaml
@@ -111,7 +111,7 @@ spec:
     splunk/splunk-operator\n\n\n## Known Issues for the Splunk Operator\n\nReview
     the [Change Log](https://github.com/splunk/splunk-operator/blob/master/docs/ChangeLog.md)
     page for a history of changes in each release.\n\n## Prerequisites for the Splunk
-    Operator\n\n### Supported Kubernetes Versions\n\n- Kubernetes, version 1.16.2+
+    Operator\n\n### Supported Kubernetes Versions\n\n- Kubernetes, version 1.20+
     and later (x86 64-bit only).\n\nThe Splunk Operator should work with any [CNCF
     certified distribution](https://www.cncf.io/certification/software-conformance/)
     of Kubernetes. We do not have platform recommendations, but this is a table of

diff --git a/docs/README.md b/docs/README.md
@@ -37,7 +37,7 @@ Review the [Change Log](ChangeLog.md) page for a history of changes in each rele
 
 ### Supported Kubernetes Versions
 
-- Kubernetes, version 1.16.2+ and later (x86 64-bit only).
+- Kubernetes, version 1.20+ and later (x86 64-bit only).
 
 The Splunk Operator should work with any [CNCF certified distribution](https://www.cncf.io/certification/software-conformance/) of Kubernetes. We do not have platform recommendations, but this is a table of platforms that our developers, customers, and partners have used successfully with the Splunk Operator.
 
@@ -53,8 +53,7 @@ Each Splunk Operator release has specific Splunk Enterprise compatibility requir
 
 ### Splunk Apps Installation
 
-Apps and add-ons can be installed using the Splunk Operator by following the instructions given at [Installing Splunk Apps](Examples.md#installing-splunk-apps).  Premium apps such as Enterprise Security and IT Service Intelligence are currently not supported.
-
+Apps and add-ons can be installed using the Splunk Operator by following the instructions given at [Installing Splunk Apps](Examples.md#installing-splunk-apps). For the installation of premium apps please refer to [Premium Apps Installation Guide](PremiumApps.md).
 
 ### Docker requirements
 The Splunk Operator requires these docker images to be present or available to your Kubernetes cluster: