CSPL-1556: Merge master into develop branch (#633)

* CSPL-1553: Modify apiVersion in cluster_role.yaml to rbac.authorization.k8s.io/v1 (for compatibility with Kubernetes 1.22+) * CSPL-1555: SOK release 1.0.5
splunk · Dec 21, 2021 · ab92d89 · ab92d89
1 parent 3d83649
commit ab92d89
Show file tree

Hide file tree

Showing 14 changed files with 14,465 additions and 13 deletions.
diff --git a/deploy/cluster_role.yaml b/deploy/cluster_role.yaml
@@ -1,5 +1,5 @@
 ---
-apiVersion: rbac.authorization.k8s.io/v1beta1
+apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
   labels:

diff --git a/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_clustermasters_crd.yaml b/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_clustermasters_crd.yaml
diff --git a/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_indexerclusters_crd.yaml b/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_indexerclusters_crd.yaml
diff --git a/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_licensemasters_crd.yaml b/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_licensemasters_crd.yaml
diff --git a/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_searchheadclusters_crd.yaml b/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_searchheadclusters_crd.yaml
diff --git a/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_standalones_crd.yaml b/deploy/olm-catalog/splunk/1.0.5/enterprise.splunk.com_standalones_crd.yaml
diff --git a/deploy/olm-catalog/splunk/1.0.5/splunk.v1.0.5.clusterserviceversion.yaml b/deploy/olm-catalog/splunk/1.0.5/splunk.v1.0.5.clusterserviceversion.yaml
@@ -0,0 +1,350 @@
+apiVersion: operators.coreos.com/v1alpha1
+kind: ClusterServiceVersion
+metadata:
+  annotations:
+    alm-examples: |-
+      [{
+        "apiVersion": "enterprise.splunk.com/v2",
+        "kind": "IndexerCluster",
+        "metadata": {
+          "name": "example",
+          "finalizers": [ "enterprise.splunk.com/delete-pvc" ]
+        },
+        "spec": {
+          "replicas": 1
+        }
+      },
+      {
+        "apiVersion": "enterprise.splunk.com/v2",
+        "kind": "LicenseMaster",
+        "metadata": {
+          "name": "example",
+          "finalizers": [ "enterprise.splunk.com/delete-pvc" ]
+        },
+        "spec": {}
+      },
+      {
+        "apiVersion": "enterprise.splunk.com/v2",
+        "kind": "SearchHeadCluster",
+        "metadata": {
+          "name": "example",
+          "finalizers": [ "enterprise.splunk.com/delete-pvc" ]
+        },
+        "spec": {
+          "replicas": 1
+        }
+      },
+      {
+        "apiVersion": "enterprise.splunk.com/v2",
+        "kind": "Standalone",
+        "metadata": {
+          "name": "example",
+          "finalizers": [ "enterprise.splunk.com/delete-pvc" ]
+        },
+        "spec": {}
+      }]
+    capabilities: Basic Install
+  name: splunk.v1.0.5
+  namespace: placeholder
+spec:
+  apiservicedefinitions: {}
+  customresourcedefinitions:
+    owned:
+    - description: ClusterMaster is the Schema for the clustermasters API
+      kind: ClusterMaster
+      name: clustermasters.enterprise.splunk.com
+      version: v2
+      resources:
+      - kind: StatefulSets
+        version: apps/v1
+      - kind: Deployments
+        version: apps/v1
+      - kind: Pods
+        version: v1
+      - kind: Services
+        version: v1
+      - kind: ConfigMaps
+        version: v1
+      - kind: Secrets
+        version: v1
+      displayName: IndexerCluster
+    - displayName: LicenseMaster
+      kind: ClusterMaster
+      name: clustermasters.enterprise.splunk.com
+      resources:
+      - kind: StatefulSets
+        version: apps/v1
+      - kind: Deployments
+        version: apps/v1
+      - kind: Pods
+        version: v1
+      - kind: Services
+        version: v1
+      - kind: ConfigMaps
+        version: v1
+      - kind: Secrets
+        version: v1
+      version: v1
+    - displayName: SearchHeadCluster
+      kind: ClusterMaster
+      name: clustermasters.enterprise.splunk.com
+      resources:
+      - kind: StatefulSets
+        version: apps/v1
+      - kind: Deployments
+        version: apps/v1
+      - kind: Pods
+        version: v1
+      - kind: Services
+        version: v1
+      - kind: ConfigMaps
+        version: v1
+      - kind: Secrets
+        version: v1
+      version: v1beta1
+    - kind: ClusterMaster
+      name: clustermasters.enterprise.splunk.com
+      resources:
+      - kind: StatefulSets
+        version: apps/v1
+      - kind: Deployments
+        version: apps/v1
+      - kind: Pods
+        version: v1
+      - kind: Services
+        version: v1
+      - kind: ConfigMaps
+        version: v1
+      - kind: Secrets
+        version: v1
+      version: v1alpha3
+    - displayName: Standalone
+      kind: ClusterMaster
+      name: clustermasters.enterprise.splunk.com
+      resources:
+      - kind: StatefulSets
+        version: apps/v1
+      - kind: Deployments
+        version: apps/v1
+      - kind: Pods
+        version: v1
+      - kind: Services
+        version: v1
+      - kind: ConfigMaps
+        version: v1
+      - kind: Secrets
+        version: v1
+      version: v1alpha2
+    - description: IndexerCluster is the Schema for a Splunk Enterprise indexer cluster
+      kind: IndexerCluster
+      name: indexerclusters.enterprise.splunk.com
+      version: v2
+    - kind: IndexerCluster
+      name: indexerclusters.enterprise.splunk.com
+      version: v1
+    - kind: IndexerCluster
+      name: indexerclusters.enterprise.splunk.com
+      version: v1beta1
+    - kind: IndexerCluster
+      name: indexerclusters.enterprise.splunk.com
+      version: v1alpha3
+    - kind: IndexerCluster
+      name: indexerclusters.enterprise.splunk.com
+      version: v1alpha2
+    - description: LicenseMaster is the Schema for a Splunk Enterprise license manager.
+      kind: LicenseMaster
+      name: licensemasters.enterprise.splunk.com
+      version: v2
+    - kind: LicenseMaster
+      name: licensemasters.enterprise.splunk.com
+      version: v1
+    - kind: LicenseMaster
+      name: licensemasters.enterprise.splunk.com
+      version: v1beta1
+    - kind: LicenseMaster
+      name: licensemasters.enterprise.splunk.com
+      version: v1alpha3
+    - kind: LicenseMaster
+      name: licensemasters.enterprise.splunk.com
+      version: v1alpha2
+    - description: SearchHeadCluster is the Schema for a Splunk Enterprise search
+        head cluster
+      kind: SearchHeadCluster
+      name: searchheadclusters.enterprise.splunk.com
+      version: v2
+    - kind: SearchHeadCluster
+      name: searchheadclusters.enterprise.splunk.com
+      version: v1
+    - kind: SearchHeadCluster
+      name: searchheadclusters.enterprise.splunk.com
+      version: v1beta1
+    - kind: SearchHeadCluster
+      name: searchheadclusters.enterprise.splunk.com
+      version: v1alpha3
+    - kind: SearchHeadCluster
+      name: searchheadclusters.enterprise.splunk.com
+      version: v1alpha2
+    - description: Standalone is the Schema for a Splunk Enterprise standalone instances.
+      kind: Standalone
+      name: standalones.enterprise.splunk.com
+      version: v2
+    - kind: Standalone
+      name: standalones.enterprise.splunk.com
+      version: v1
+    - kind: Standalone
+      name: standalones.enterprise.splunk.com
+      version: v1beta1
+    - kind: Standalone
+      name: standalones.enterprise.splunk.com
+      version: v1alpha3
+    - kind: Standalone
+      name: standalones.enterprise.splunk.com
+      version: v1alpha2
+  description: K8 Operator for Splunk Enterprise Deployments
+  displayName: Splunk Operator
+  icon:
+  - base64data: ""
+    mediatype: ""
+  install:
+    spec:
+      clusterPermissions:
+      - rules:
+        - apiGroups:
+          - ""
+          resources:
+          - secrets
+          verbs:
+          - watch
+          - list
+        - apiGroups:
+          - enterprise.splunk.com
+          resources:
+          - '*'
+          verbs:
+          - '*'
+        - apiGroups:
+          - apps
+          resources:
+          - deployments
+          - statefulsets
+          verbs:
+          - list
+          - get
+          - watch
+        serviceAccountName: splunk:operator:resource-manager
+      deployments:
+      - name: splunk-operator
+        spec:
+          replicas: 1
+          selector:
+            matchLabels:
+              name: splunk-operator
+          strategy: {}
+          template:
+            metadata:
+              labels:
+                name: splunk-operator
+            spec:
+              containers:
+              - env:
+                - name: WATCH_NAMESPACE
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.annotations['olm.targetNamespaces']
+                - name: POD_NAME
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.name
+                - name: OPERATOR_NAME
+                  value: splunk-operator
+                - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
+                  value: docker.io/splunk/splunk:8.2.3.3
+                image: docker.io/splunk/splunk-operator:1.0.5
+                imagePullPolicy: IfNotPresent
+                name: splunk-operator
+                resources: {}
+              serviceAccountName: splunk-operator
+      permissions:
+      - rules:
+        - apiGroups:
+          - ""
+          resources:
+          - services
+          - endpoints
+          - persistentvolumeclaims
+          - configmaps
+          - secrets
+          - pods
+          - pods/exec
+          - serviceaccounts
+          verbs:
+          - create
+          - delete
+          - deletecollection
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        - apiGroups:
+          - ""
+          resources:
+          - events
+          verbs:
+          - get
+          - list
+          - watch
+        - apiGroups:
+          - apps
+          resources:
+          - deployments
+          - daemonsets
+          - replicasets
+          - statefulsets
+          verbs:
+          - create
+          - delete
+          - deletecollection
+          - get
+          - list
+          - patch
+          - update
+          - watch
+        - apiGroups:
+          - enterprise.splunk.com
+          resources:
+          - '*'
+          - indexerclusters
+          - clustermasters
+          - licensemasters
+          - searchheadclusters
+          - standalones
+          verbs:
+          - '*'
+        serviceAccountName: splunk-operator
+    strategy: deployment
+  installModes:
+  - supported: true
+    type: OwnNamespace
+  - supported: true
+    type: SingleNamespace
+  - supported: false
+    type: MultiNamespace
+  - supported: true
+    type: AllNamespaces
+  keywords:
+  - Splunk
+  - Enterprise
+  - Operator
+  links:
+  - name: Splunk
+    url: https://splunk.domain
+  maintainers:
+  - email: docker-maint@splunk.com
+    name: Splunk Docker Maintainers
+  maturity: alpha
+  provider:
+    name: Splunk Inc.
+    url: www.splunk.com
+  replaces: splunk.v1.0.4
+  version: 1.0.5
diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -30,4 +30,4 @@ spec:
         - name: OPERATOR_NAME
           value: "splunk-operator"
         - name: RELATED_IMAGE_SPLUNK_ENTERPRISE
-          value: "docker.io/splunk/splunk:8.2.3.2"
+          value: "docker.io/splunk/splunk:8.2.3.3"
diff --git a/docs/ChangeLog.md b/docs/ChangeLog.md
@@ -1,4 +1,11 @@
 # Splunk Operator for Kubernetes Change Log
+## 1.0.5 (2021-12-17)
+* This is the 1.0.5 release. The Splunk Operator for Kubernetes is a supported platform for deploying Splunk Enterprise with the prerequisites and constraints laid out [here](https://github.com/splunk/splunk-operator/blob/develop/docs/README.md#prerequisites-for-the-splunk-operator)
+
+* This release depends upon changes made concurrently in the Splunk Enterprise container images. You should use the splunk/splunk:8.2.3.3 image with it
+
+* CSPL-1553: Modify apiVersion in cluster_role.yaml to rbac.authorization.k8s.io/v1 (for compatibility with Kubernetes 1.22+)
+
 ## 1.0.4 (2021-12-13)
 * This is the 1.0.4 release. The Splunk Operator for Kubernetes is a supported platform for deploying Splunk Enterprise with the prerequisites and constraints laid out [here](https://github.com/splunk/splunk-operator/blob/develop/docs/README.md#prerequisites-for-the-splunk-operator)
 

diff --git a/docs/Images.md b/docs/Images.md
@@ -2,8 +2,8 @@
 
 The Splunk Operator requires these docker images to be present or available to your Kubernetes cluster:
 
-* `splunk/splunk-operator`: The Splunk Operator image built by this repository or the [official release](https://hub.docker.com/r/splunk/splunk-operator) (1.0.4 or later)
-* `splunk/splunk:<version>`: The [Splunk Enterprise image](https://github.com/splunk/docker-splunk) (8.2.3.2 or later)
+* `splunk/splunk-operator`: The Splunk Operator image built by this repository or the [official release](https://hub.docker.com/r/splunk/splunk-operator) (1.0.5 or later)
+* `splunk/splunk:<version>`: The [Splunk Enterprise image](https://github.com/splunk/docker-splunk) (8.2.3.3 or later)
 
 All of these images are publicly available, and published on [Docker Hub](https://hub.docker.com/).