Skip to content

Commit

Permalink
Merge pull request #1486 from rancher/remove-json-detector
Browse files Browse the repository at this point in the history
[CHORE] Update versions
  • Loading branch information
dbason authored Jun 7, 2023
2 parents 5a4b0e6 + 7e3272b commit a0f359b
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 14 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-rc7'
version = '0.10.0-rc8'
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-rc7"
opniVersion: "0.10.0-rc8"

dagger.#Plan & {
client: {
Expand Down
4 changes: 2 additions & 2 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-rc7
appVersion: 0.10.0-rc8
dependencies:
- 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-rc7
version: 0.10.0-rc8
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-rc7
version: 0.10.0-rc8
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-rc7
appVersion: 0.10.0-rc8
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-rc7
version: 0.10.0-rc8
2 changes: 1 addition & 1 deletion packages/opni/opni/package.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
url: local
version: 0.10.0-rc7
version: 0.10.0-rc8
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-rc7"
version = "0.10.0-rc8"
}

image := fmt.Sprintf(
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-rc7"
const defaultOpniVersion = "0.10.0-rc8"

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-rc7"
version = "0.10.0-rc8"
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-rc7"),
Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.10.0-rc8"),
},
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-rc7"))
Expect(object.Spec.Version).To(Equal("0.10.0-rc8"))
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-rc7")
object.Status.Version = lo.ToPtr("0.10.0-rc8")
Expect(k8sClient.Status().Update(context.Background(), object)).To(Succeed())
})
Specify("check upgrade available should return true", func() {
Expand Down

0 comments on commit a0f359b

Please sign in to comment.