diff --git a/bundle/manifests/splunk-operator.clusterserviceversion.yaml b/bundle/manifests/splunk-operator.clusterserviceversion.yaml index dc1208f47..270a6eb3f 100644 --- a/bundle/manifests/splunk-operator.clusterserviceversion.yaml +++ b/bundle/manifests/splunk-operator.clusterserviceversion.yaml @@ -111,7 +111,7 @@ metadata: capabilities: Seamless Upgrades categories: Big Data, Logging & Tracing, Monitoring, Security, AI/Machine Learning containerImage: splunk/splunk-operator@sha256:c4e0d314622699496f675760aad314520d050a66627fdf33e1e21fa28ca85d50 - createdAt: "2024-02-23T07:18:56Z" + createdAt: "2024-02-29T18:47:11Z" description: The Splunk Operator for Kubernetes enables you to quickly and easily deploy Splunk Enterprise on your choice of private or public cloud provider. The Operator simplifies scaling and management of Splunk Enterprise by automating diff --git a/docs/AppFramework.md b/docs/AppFramework.md index 7102a05a5..bd5e66025 100644 --- a/docs/AppFramework.md +++ b/docs/AppFramework.md @@ -559,7 +559,7 @@ spec: - name: OPERATOR_NAME value: "splunk-operator" - name: RELATED_IMAGE_SPLUNK_ENTERPRISE - value: "docker.io/splunk/splunk:9.0.3-a2" + value: "docker.io/splunk/splunk:9.1.3" volumes: - name: app-staging diff --git a/docs/Install.md b/docs/Install.md index 7bbd26932..1ef6b2644 100644 --- a/docs/Install.md +++ b/docs/Install.md @@ -31,7 +31,7 @@ If Splunk Operator is installed clusterwide and user wants to manage multiple na - name: WATCH_NAMESPACE value: "namespace1,namespace2" - name: RELATED_IMAGE_SPLUNK_ENTERPRISE - value: splunk/splunk:9.0.3-a2 + value: splunk/splunk:9.1.3 - name: OPERATOR_NAME value: splunk-operator - name: POD_NAME @@ -68,7 +68,7 @@ If you are using a private registry for the Docker images, edit `deployment` `sp - name: WATCH_NAMESPACE value: "namespace1,namespace2" - name: RELATED_IMAGE_SPLUNK_ENTERPRISE - value: splunk/splunk:9.0.3-a2 + value: splunk/splunk:9.1.3 - name: OPERATOR_NAME value: splunk-operator - name: POD_NAME diff --git a/docs/MultisiteExamples.md b/docs/MultisiteExamples.md index 15139b57c..bff1fcb1e 100644 --- a/docs/MultisiteExamples.md +++ b/docs/MultisiteExamples.md @@ -45,7 +45,7 @@ Limitation: all the IndexerCluster resources must be located in the same namespa #### Deploy the cluster-manager -Note: +Note: * The image version is defined in these resources as this allows to control the upgrade cycle * For all available default parameters refer to [splunk-ansible default.yml.spec.md](https://github.com/splunk/splunk-ansible/blob/develop/docs/advanced/default.yml.spec.md) @@ -148,7 +148,7 @@ metadata: - enterprise.splunk.com/delete-pvc spec: replicas: 3 - image: "splunk/splunk:9.0.3-a2" + image: "splunk/splunk:9.1.3" clusterManagerRef: name: example defaults: |- @@ -157,4 +157,3 @@ spec: site: site0 EOF ``` - diff --git a/docs/SplunkOperatorUpgrade.md b/docs/SplunkOperatorUpgrade.md index c44cb993c..141426e03 100644 --- a/docs/SplunkOperatorUpgrade.md +++ b/docs/SplunkOperatorUpgrade.md @@ -1,7 +1,5 @@ # How to upgrade Splunk Operator and Splunk Enterprise Deployments -To upgrade the Splunk Operator for Kubernetes, you will overwrite the prior Operator release with the latest version. Once the lastest version of `splunk-operator-namespace.yaml` ([see below](#upgrading-splunk-operator-and-splunk-operator-deployment)) is applied the CRD's are updated and Operator deployment is updated with newer version of Splunk Operator image. Any new spec defined by the operator will be applied to the pods managed by Splunk Operator for Kubernetes. -To upgrade the Splunk Operator for Kubernetes, you will overwrite the prior Operator release with the latest version. Once the lastest version of `splunk-operator-namespace.yaml` ([see below](#upgrading-splunk-operator-and-splunk-operator-deployment)) is applied the CRD's are updated and Operator deployment is updated with newer version of Splunk Operator image. Any new spec defined by the operator will be applied to the pods managed by Splunk Operator for Kubernetes. To upgrade the Splunk Operator for Kubernetes, you will overwrite the prior Operator release with the latest version. Once the lastest version of `splunk-operator-namespace.yaml` ([see below](#upgrading-splunk-operator-and-splunk-operator-deployment)) is applied the CRD's are updated and Operator deployment is updated with newer version of Splunk Operator image. Any new spec defined by the operator will be applied to the pods managed by Splunk Operator for Kubernetes. ​ A Splunk Operator for Kubernetes upgrade might include support for a later version of the Splunk Enterprise Docker image. In that scenario, after the Splunk Operator completes its upgrade, the pods managed by Splunk Operator for Kubernetes will be restarted using the latest Splunk Enterprise Docker image. @@ -13,8 +11,6 @@ A Splunk Operator for Kubernetes upgrade might include support for a later versi * Before you upgrade, review the Splunk Operator [change log](https://github.com/splunk/splunk-operator/releases) page for information on changes made in the latest release. The Splunk Enterprise Docker image compatibility is noted in each release version. ​ * If the Splunk Enterprise Docker image changes, review the Splunk Enterprise [Upgrade Readme](https://docs.splunk.com/Documentation/Splunk/latest/Installation/AboutupgradingREADTHISFIRST) page before upgrading. -* If the Splunk Enterprise Docker image changes, review the Splunk Enterprise [Upgrade Readme](https://docs.splunk.com/Documentation/Splunk/latest/Installation/AboutupgradingREADTHISFIRST) page before upgrading. -* If the Splunk Enterprise Docker image changes, review the Splunk Enterprise [Upgrade Readme](https://docs.splunk.com/Documentation/Splunk/latest/Installation/AboutupgradingREADTHISFIRST) page before upgrading. ​ * For general information about Splunk Enterprise compatibility and the upgrade process, see [How to upgrade Splunk Enterprise](https://docs.splunk.com/Documentation/Splunk/latest/Installation/HowtoupgradeSplunk). ​ @@ -108,7 +104,7 @@ Edit `deployment` `splunk-operator-controller-manager-` in `splunk-operat - name: WATCH_NAMESPACE value: "splunk-operator" - name: RELATED_IMAGE_SPLUNK_ENTERPRISE - value: splunk/splunk:9.0.3-a2 + value: splunk/splunk:9.1.3 - name: OPERATOR_NAME value: splunk-operator - name: POD_NAME @@ -143,7 +139,7 @@ To verify that a new Splunk Enterprise Docker image was applied to a pod, you ca ​ ```bash kubectl get pods splunk--monitoring-console-0 -o yaml | grep -i image -image: splunk/splunk:9.0.3-a2 +image: splunk/splunk:9.1.3 imagePullPolicy: IfNotPresent ``` ## Splunk Enterprise Cluster upgrade example diff --git a/docs/index.yaml b/docs/index.yaml index 52b36c5fb..4ad180bab 100644 --- a/docs/index.yaml +++ b/docs/index.yaml @@ -3,14 +3,14 @@ entries: splunk-enterprise: - apiVersion: v2 appVersion: 2.5.2 - created: "2024-02-23T07:18:59.326793799Z" + created: "2024-02-29T11:04:35.96595-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator repository: file://splunk-operator/helm-chart/splunk-operator version: 2.5.2 description: A Helm chart for Splunk Enterprise managed by the Splunk Operator - digest: 6af6c0bcde996bb58f4e6b22a83aa1a65aa65aada0bd63935983d2e782871799 + digest: acedc2849dcf07f480d3fbcc61da4cdcd2dfa647286ee530f1a7a005f1a95d48 maintainers: - email: vivekr@splunk.com name: Vivek Reddy @@ -23,14 +23,14 @@ entries: version: 2.5.2 - apiVersion: v2 appVersion: 2.5.1 - created: "2024-02-23T07:18:59.27304029Z" + created: "2024-02-29T11:04:35.751907-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator repository: file://splunk-operator/helm-chart/splunk-operator version: 2.5.1 description: A Helm chart for Splunk Enterprise managed by the Splunk Operator - digest: 481adaeaf4891252de9a76c80bd2c1e4d409b550e1f5c923c91ab1329878042f + digest: 089e62bd7c5054b29f6c7cf6a9e72c4b3731debe90fe02ee3fc1eb10c5d2f455 maintainers: - email: vivekr@splunk.com name: Vivek Reddy @@ -43,7 +43,7 @@ entries: version: 2.5.1 - apiVersion: v2 appVersion: 2.5.0 - created: "2024-02-23T07:18:59.230817349Z" + created: "2024-02-29T11:04:35.550092-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -63,7 +63,7 @@ entries: version: 2.5.0 - apiVersion: v2 appVersion: 2.4.0 - created: "2024-02-23T07:18:59.198071732Z" + created: "2024-02-29T11:04:35.418818-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -85,7 +85,7 @@ entries: version: 2.4.0 - apiVersion: v2 appVersion: 2.3.0 - created: "2024-02-23T07:18:59.173647877Z" + created: "2024-02-29T11:04:35.327593-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -107,7 +107,7 @@ entries: version: 2.3.0 - apiVersion: v2 appVersion: 2.2.1 - created: "2024-02-23T07:18:59.160731885Z" + created: "2024-02-29T11:04:35.278896-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -122,7 +122,7 @@ entries: version: 2.2.1 - apiVersion: v2 appVersion: 2.2.0 - created: "2024-02-23T07:18:59.14791233Z" + created: "2024-02-29T11:04:35.231474-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -137,7 +137,7 @@ entries: version: 2.2.0 - apiVersion: v2 appVersion: 2.1.0 - created: "2024-02-23T07:18:59.128430587Z" + created: "2024-02-29T11:04:35.143211-08:00" dependencies: - condition: splunk-operator.enabled name: splunk-operator @@ -153,9 +153,9 @@ entries: splunk-operator: - apiVersion: v2 appVersion: 2.5.2 - created: "2024-02-23T07:18:59.417944765Z" + created: "2024-02-29T11:04:36.292954-08:00" description: A Helm chart for the Splunk Operator for Kubernetes - digest: d5f471159fa07658fd05e266de3689bcf76895e91a909e3fcbcca51b72c6e6e6 + digest: 7ab3e92f9f9f0a964294b95bf32066edb1b6d5375cd59099c9525f3ca733327a maintainers: - email: vivekr@splunk.com name: Vivek Reddy @@ -168,9 +168,9 @@ entries: version: 2.5.2 - apiVersion: v2 appVersion: 2.5.1 - created: "2024-02-23T07:18:59.406345624Z" + created: "2024-02-29T11:04:36.253326-08:00" description: A Helm chart for the Splunk Operator for Kubernetes - digest: 02e6a28c2daaaed160277b10c64174d2235e571ca1fc5f93e8cf3c80493c60f9 + digest: 5c90889e175bbfc79cbb7f83bf213de43a46c4d688574d04ff82aa16dcd8681a maintainers: - email: vivekr@splunk.com name: Vivek Reddy @@ -183,7 +183,7 @@ entries: version: 2.5.1 - apiVersion: v2 appVersion: 2.5.0 - created: "2024-02-23T07:18:59.393701948Z" + created: "2024-02-29T11:04:36.210826-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: ed93f8fac421f92cfdbfd043ec27911a07ec7db2c05b4efc3137cef4f2bfca4a maintainers: @@ -198,7 +198,7 @@ entries: version: 2.5.0 - apiVersion: v2 appVersion: 2.4.0 - created: "2024-02-23T07:18:59.382941953Z" + created: "2024-02-29T11:04:36.168828-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 9d0377747e46df4bf4b9dbd447c9ff46c926bfe2c66fd07d6d27a61abb31cb42 maintainers: @@ -215,7 +215,7 @@ entries: version: 2.4.0 - apiVersion: v2 appVersion: 2.3.0 - created: "2024-02-23T07:18:59.37080276Z" + created: "2024-02-29T11:04:36.127792-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 23e70ec4059bc92920d7d3adce3bff6b8aba0d5eb5d4c0efe225bf3b88d5b274 maintainers: @@ -232,7 +232,7 @@ entries: version: 2.3.0 - apiVersion: v2 appVersion: 2.2.1 - created: "2024-02-23T07:18:59.358951937Z" + created: "2024-02-29T11:04:36.084283-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 8868b9ae2ebde0c667b13c97d71d904a31b5a9f2c803b199bc77324f1727e1fd name: splunk-operator @@ -242,7 +242,7 @@ entries: version: 2.2.1 - apiVersion: v2 appVersion: 2.2.0 - created: "2024-02-23T07:18:59.348286318Z" + created: "2024-02-29T11:04:36.043345-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 49c72276bd7ff93465b0545d8b0814f684cade7d2cd191b6d73d4c3660bd1fb4 name: splunk-operator @@ -252,7 +252,7 @@ entries: version: 2.2.0 - apiVersion: v2 appVersion: 2.1.0 - created: "2024-02-23T07:18:59.337531553Z" + created: "2024-02-29T11:04:36.00884-08:00" description: A Helm chart for the Splunk Operator for Kubernetes digest: 34e5463f8f5442655d05cb616b50391b738a0827b30d8440b4c7fce99a291d9a name: splunk-operator @@ -260,4 +260,4 @@ entries: urls: - https://splunk.github.io/splunk-operator/splunk-operator-1.0.0.tgz version: 1.0.0 -generated: "2024-02-23T07:18:59.117529039Z" +generated: "2024-02-29T11:04:35.08619-08:00" diff --git a/docs/splunk-enterprise-2.5.1.tgz b/docs/splunk-enterprise-2.5.1.tgz index 985590a89..caf562900 100644 Binary files a/docs/splunk-enterprise-2.5.1.tgz and b/docs/splunk-enterprise-2.5.1.tgz differ diff --git a/docs/splunk-enterprise-2.5.2.tgz b/docs/splunk-enterprise-2.5.2.tgz index 05b202520..22f6f62f7 100644 Binary files a/docs/splunk-enterprise-2.5.2.tgz and b/docs/splunk-enterprise-2.5.2.tgz differ diff --git a/docs/splunk-operator-2.5.1.tgz b/docs/splunk-operator-2.5.1.tgz index 6c668a9df..80feefdcd 100644 Binary files a/docs/splunk-operator-2.5.1.tgz and b/docs/splunk-operator-2.5.1.tgz differ diff --git a/docs/splunk-operator-2.5.2.tgz b/docs/splunk-operator-2.5.2.tgz index b940f7916..08e3c5362 100644 Binary files a/docs/splunk-operator-2.5.2.tgz and b/docs/splunk-operator-2.5.2.tgz differ diff --git a/go.sum b/go.sum index 85793519e..2255021a1 100644 --- a/go.sum +++ b/go.sum @@ -253,14 +253,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/onsi/ginkgo/v2 v2.13.2 h1:Bi2gGVkfn6gQcjNjZJVO8Gf0FHzMPf2phUei9tejVMs= -github.com/onsi/ginkgo/v2 v2.13.2/go.mod h1:XStQ8QcGwLyF4HdfcZB8SFOS/MWCgDuXMSBe6zrvLgM= -github.com/onsi/ginkgo/v2 v2.14.0 h1:vSmGj2Z5YPb9JwCWT6z6ihcUvDhuXLc3sJiqd3jMKAY= -github.com/onsi/ginkgo/v2 v2.14.0/go.mod h1:JkUdW7JkN0V6rFvsHcJ478egV3XH9NxpD27Hal/PhZw= github.com/onsi/ginkgo/v2 v2.15.0 h1:79HwNRBAZHOEwrczrgSOPy+eFTTlIGELKy5as+ClttY= github.com/onsi/ginkgo/v2 v2.15.0/go.mod h1:HlxMHtYF57y6Dpf+mc5529KKmSq9h2FpCF+/ZkwUxKM= -github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= -github.com/onsi/gomega v1.30.0/go.mod h1:9sxs+SwGrKI0+PWe4Fxa9tFQQBG5xSsSbMXOI8PPpoQ= github.com/onsi/gomega v1.31.1 h1:KYppCUK+bUgAZwHOu7EXVBKyQA6ILvOESHkn/tgoqvo= github.com/onsi/gomega v1.31.1/go.mod h1:y40C95dwAD1Nz36SsEnxvfFe8FFfNxzI5eJ0EYGyAy0= github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -377,8 +371,6 @@ golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzB golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/mod v0.13.0 h1:I/DsJXRlw/8l/0c24sM9yb0T4z9liZTduXvdAWYiysY= -golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -439,8 +431,6 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q= -golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc= golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -454,8 +444,6 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -508,8 +496,6 @@ golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= -golang.org/x/tools v0.14.0 h1:jvNa2pY0M4r62jkRQ6RwEZZyPcymeL9XZMLBbV7U2nc= -golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg= golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA= golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.1.tgz b/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.1.tgz index 6c668a9df..80feefdcd 100644 Binary files a/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.1.tgz and b/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.1.tgz differ diff --git a/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.2.tgz b/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.2.tgz index b940f7916..08e3c5362 100644 Binary files a/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.2.tgz and b/helm-chart/splunk-enterprise/charts/splunk-operator-2.5.2.tgz differ diff --git a/test/appframework_aws/c3/manager_appframework_test.go b/test/appframework_aws/c3/manager_appframework_test.go index 38dc33dae..c43e030ee 100644 --- a/test/appframework_aws/c3/manager_appframework_test.go +++ b/test/appframework_aws/c3/manager_appframework_test.go @@ -328,8 +328,8 @@ var _ = Describe("c3appfw test", func() { } // Upload V1 apps to S3 for Monitoring Console - oldImage := "splunk/splunk:9.0.3-a2" - newImage := "splunk/splunk:9.0.5" + oldImage := "splunk/splunk:9.0.5" + newImage := "splunk/splunk:9.1.3" lm, err := deployment.DeployLicenseManager(ctx, deployment.GetName()) cm, err := deployment.DeployClusterManager(ctx, deployment.GetName(), lm.GetName(), "", "") diff --git a/test/deploy-eks-cluster.sh b/test/deploy-eks-cluster.sh index a4e7d47f0..c5c405a22 100755 --- a/test/deploy-eks-cluster.sh +++ b/test/deploy-eks-cluster.sh @@ -92,6 +92,7 @@ function createCluster() { aws iam attach-role-policy --policy-arn arn:aws:iam::aws:policy/service-role/AmazonEBSCSIDriverPolicy --role-name ${rolename} kubectl annotate serviceaccount -n $namespace $service_account eks.amazonaws.com/role-arn=arn:aws:iam::$account_id:role/${rolename} eksctl create addon --name aws-ebs-csi-driver --cluster ${TEST_CLUSTER_NAME} --service-account-role-arn arn:aws:iam::$account_id:role/${rolename} --force + eksctl utils update-cluster-logging --cluster ${TEST_CLUSTER_NAME} else echo "Retrieving kubeconfig for ${TEST_CLUSTER_NAME}" # Cluster exists but kubeconfig may not diff --git a/test/run-tests.sh b/test/run-tests.sh index 6eabde8bc..a5069cf83 100755 --- a/test/run-tests.sh +++ b/test/run-tests.sh @@ -76,6 +76,7 @@ fi if [ $? -ne 0 ]; then echo "Unable to install the operator. Exiting..." + kubectl describe pod -n splunk-operator exit 1 fi @@ -86,6 +87,16 @@ if [ "${CLUSTER_WIDE}" == "true" ]; then sleep 2 kubectl wait --for=condition=ready pod -l control-plane=controller-manager --timeout=600s -n splunk-operator if [ $? -ne 0 ]; then + echo "kubectl get pods -n kube-system ---" + kubectl get pods -n kube-system + echo "kubectl get deployement ebs-csi-controller -n kube-system ---" + kubectl get deployement ebs-csi-controller -n kube-system + echo "kubectl describe pvc -n splunk-operator ---" + kubectl describe pvc -n splunk-operator + echo "kubectl describe pv ---" + kubectl describe pv + echo "kubectl describe pod -n splunk-operator ---" + kubectl describe pod -n splunk-operator echo "Operator installation not ready..." exit 1 fi