Skip to content

Commit

Permalink
Merge pull request #1464 from rancher/update-versions
Browse files Browse the repository at this point in the history
Update version numbers to 0.10.0-rc4
  • Loading branch information
kralicky committed May 31, 2023
2 parents c4c88fb + 5811020 commit a8882e3
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 20 deletions.
2 changes: 1 addition & 1 deletion Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ load('ext://namespace', 'namespace_create')

set_team('52cc75cc-c4ed-462f-8ea7-a543d398a381')

version = '0.10.0-rc3'
version = '0.10.0-rc4'
config.define_string_list('allowedContexts')
config.define_string_list('opniChartValues')
config.define_string('defaultRegistry')
Expand Down
2 changes: 1 addition & 1 deletion ci.cue
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/rancher/opni/images"
)

opniVersion: "0.10.0-rc3"
opniVersion: "0.10.0-rc4"

dagger.#Plan & {
client: {
Expand Down
10 changes: 5 additions & 5 deletions packages/opni-agent/opni-agent/charts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ annotations:
catalog.rancher.io/namespace: opni-system
catalog.rancher.io/release-name: opni-agent
apiVersion: v2
appVersion: 0.10.0-rc3
appVersion: 0.10.0-rc4
dependencies:
- condition: kube-prometheus-stack.enabled
name: kube-prometheus-stack
repository: file://./charts/kube-prometheus-stack
- condition: kube-prometheus-stack.enabled
name: kube-prometheus-stack
repository: file://./charts/kube-prometheus-stack
description: Opni Agent
name: opni-agent
type: application
version: 0.10.0-rc3
version: 0.10.0-rc4
2 changes: 1 addition & 1 deletion packages/opni-agent/opni-agent/package.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
url: local
version: 0.10.0-rc3
version: 0.10.0-rc4
workingDir: charts
4 changes: 2 additions & 2 deletions packages/opni/opni/charts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ annotations:
catalog.rancher.io/namespace: opni-cluster-system
catalog.rancher.io/release-name: opni
apiVersion: v2
appVersion: 0.10.0-rc3
appVersion: 0.10.0-rc4
dependencies:
- condition: opni-agent.kube-prometheus-stack.enabled
name: kube-prometheus-stack
Expand All @@ -31,4 +31,4 @@ maintainers:
name: Dan Bason
name: opni
type: application
version: 0.10.0-rc3
version: 0.10.0-rc4
2 changes: 1 addition & 1 deletion packages/opni/opni/package.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

url: local
version: 0.10.0-rc3
version: 0.10.0-rc4
workingDir: charts
additionalCharts:
- workingDir: charts-crd
Expand Down
2 changes: 1 addition & 1 deletion pkg/resources/opniopensearch/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ func (r *Reconciler) buildOpensearchCluster(
// Set default image version
version := r.instance.Spec.Version
if version == "unversioned" {
version = "0.10.0-rc3"
version = "0.10.0-rc4"
}

image := fmt.Sprintf(
Expand Down
4 changes: 2 additions & 2 deletions plugins/aiops/pkg/gateway/admin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ var _ = Describe("AI Admin", Ordered, Label("integration"), func() {
})
When("new version is available", func() {
BeforeEach(func() {
version = "v0.10.0-rc3"
version = "v0.10.0-rc4"
})
When("updating the opni cluster", func() {
BeforeEach(func() {
Expand Down Expand Up @@ -569,7 +569,7 @@ var _ = Describe("AI Admin", Ordered, Label("integration"), func() {
Name: OpniServicesName,
Namespace: namespace,
}, cluster)).Should(Succeed())
Expect(cluster.Spec.Version).To(Equal("v0.10.0-rc3"))
Expect(cluster.Spec.Version).To(Equal("v0.10.0-rc4"))
})
})
When("new version is older", func() {
Expand Down
2 changes: 1 addition & 1 deletion plugins/aiops/pkg/gateway/plugin.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func NewPlugin(ctx context.Context, opts ...PluginOption) *AIOpsPlugin {
Name: "opni",
Namespace: os.Getenv("POD_NAMESPACE"),
},
version: "v0.10.0-rc3",
version: "v0.10.0-rc4",
}
options.apply(opts...)

Expand Down
2 changes: 1 addition & 1 deletion plugins/logging/pkg/gateway/admin_v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
corev1 "k8s.io/api/core/v1"
)

const defaultOpniVersion = "0.10.0-rc3"
const defaultOpniVersion = "0.10.0-rc4"

type ClusterStatus int

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() {

BeforeEach(func() {
namespace = "test-logging-v2"
version = "0.10.0-rc3"
version = "0.10.0-rc4"
opensearchVersion = "2.4.0"

security = &opsterv1.Security{
Expand All @@ -76,7 +76,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() {
}
dashboards = opsterv1.DashboardsConfig{
ImageSpec: &opsterv1.ImageSpec{
Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.10.0-rc3"),
Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.10.0-rc4"),
},
Replicas: 1,
Enable: true,
Expand Down Expand Up @@ -1088,7 +1088,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() {
})
}, timeout, interval).Should(BeTrue())
Expect(object.Spec.Security).To(Equal(security))
Expect(object.Spec.Version).To(Equal("0.10.0-rc3"))
Expect(object.Spec.Version).To(Equal("0.10.0-rc4"))
Expect(len(object.Spec.NodePools)).To(Equal(2))
})
When("upgrade is available", func() {
Expand All @@ -1099,7 +1099,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("integration"), func() {
}, object)
Expect(err).NotTo(HaveOccurred())
object.Status.OpensearchVersion = lo.ToPtr("2.4.0")
object.Status.Version = lo.ToPtr("0.10.0-rc3")
object.Status.Version = lo.ToPtr("0.10.0-rc4")
Expect(k8sClient.Status().Update(context.Background(), object)).To(Succeed())
})
Specify("check upgrade available should return true", func() {
Expand Down

0 comments on commit a8882e3

Please sign in to comment.