Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cut rc4 for v0.8.0 #915

Merged
merged 1 commit into from
Dec 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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.8.0-rc3"
opniVersion: "0.8.0-rc4"

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 @@ -5,12 +5,12 @@ annotations:
catalog.rancher.io/namespace: opni-system
catalog.rancher.io/release-name: opni-agent
apiVersion: v2
appVersion: 0.8.0-rc3
appVersion: 0.8.0-rc4
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.8.0-rc3
version: 0.8.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,6 +1,6 @@

url: local
version: 0.8.0-rc3
version: 0.8.0-rc4
workingDir: charts
additionalCharts:
- workingDir: charts-crd
Expand Down
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.8.0-rc3
appVersion: 0.8.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.8.0-rc3
version: 0.8.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.8.0-rc3
version: 0.8.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 @@ -39,7 +39,7 @@ func (r *Reconciler) buildOpensearchCluster(
// Set default image version
version := r.instance.Spec.Version
if version == "unversioned" {
version = "0.8.0-rc3"
version = "0.8.0-rc4"
}

image := fmt.Sprintf(
Expand Down
4 changes: 2 additions & 2 deletions plugins/logging/pkg/gateway/admin.go
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ func (p *Plugin) convertProtobufToDashboards(
cluster *loggingv1beta1.OpniOpensearch,
) opsterv1.DashboardsConfig {
var osVersion string
version := "0.8.0-rc3"
version := "0.8.0-rc4"
if cluster == nil {
if util.Version != "unversioned" {
version = strings.TrimPrefix(util.Version, "v")
Expand All @@ -436,7 +436,7 @@ func (p *Plugin) convertProtobufToDashboards(
}

if version == "unversioned" {
version = "0.8.0-rc3"
version = "0.8.0-rc4"
}

image := fmt.Sprintf(
Expand Down
4 changes: 2 additions & 2 deletions plugins/logging/pkg/gateway/admin_v2.go
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,7 @@ func (m *LoggingManagerV2) convertProtobufToDashboards(
cluster *loggingv1beta1.OpniOpensearch,
) opsterv1.DashboardsConfig {
var osVersion string
version := "0.8.0-rc3"
version := "0.8.0-rc4"
if cluster == nil {
osVersion = opensearchVersion
} else {
Expand All @@ -1044,7 +1044,7 @@ func (m *LoggingManagerV2) convertProtobufToDashboards(
}

if version == "unversioned" {
version = "0.8.0-rc3"
version = "0.8.0-rc4"
}

if m.versionOverride != "" {
Expand Down
12 changes: 6 additions & 6 deletions plugins/logging/pkg/gateway/admin_v2_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {

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

security = &opsterv1.Security{
Expand All @@ -70,7 +70,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
}
dashboards = opsterv1.DashboardsConfig{
ImageSpec: &opsterv1.ImageSpec{
Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc3"),
Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc4"),
},
Replicas: 1,
Enable: true,
Expand Down Expand Up @@ -1053,7 +1053,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
})
When("updating the cluster", func() {
BeforeEach(func() {
version = "0.8.0-rc3"
version = "0.8.0-rc4"
})
newRequest := createRequest()
newRequest.DataNodes.Persistence = &loggingadmin.DataPersistence{
Expand Down Expand Up @@ -1142,7 +1142,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
})
}, timeout, interval).Should(BeTrue())
Expect(object.Spec.Security).To(Equal(security))
Expect(object.Spec.Version).To(Equal("0.8.0-rc3"))
Expect(object.Spec.Version).To(Equal("0.8.0-rc4"))
Expect(len(object.Spec.NodePools)).To(Equal(2))
})
When("upgrade is available", func() {
Expand All @@ -1153,7 +1153,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
}, object)
Expect(err).NotTo(HaveOccurred())
object.Status.OpensearchVersion = lo.ToPtr("2.4.0")
object.Status.Version = lo.ToPtr("0.8.0-rc3")
object.Status.Version = lo.ToPtr("0.8.0-rc4")
Expect(k8sClient.Status().Update(context.Background(), object)).To(Succeed())
})
Specify("check upgrade available should return true", func() {
Expand All @@ -1172,7 +1172,7 @@ var _ = Describe("Opensearch Admin V2", Ordered, Label("unit"), func() {
if err != nil {
return false
}
return object.Spec.Version == "0.8.0-rc3"
return object.Spec.Version == "0.8.0-rc4"
}, timeout, interval).Should(BeTrue())
})
})
Expand Down
12 changes: 6 additions & 6 deletions plugins/logging/pkg/gateway/plugin_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() {

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

request = &loggingadmin.OpensearchCluster{
Expand Down Expand Up @@ -127,7 +127,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() {
}
dashboards = opsterv1.DashboardsConfig{
ImageSpec: &opsterv1.ImageSpec{
Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc3"),
Image: lo.ToPtr("docker.io/rancher/opensearch-dashboards:2.4.0-0.8.0-rc4"),
},
Replicas: 1,
Enable: true,
Expand Down Expand Up @@ -234,7 +234,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() {
nodePool.Jvm = fmt.Sprintf("-Xmx%d -Xms%d", 2*giBytes, 2*giBytes)
nodePool.Resources.Limits[corev1.ResourceMemory] = resource.MustParse("4Gi")
nodePool.Resources.Requests[corev1.ResourceMemory] = resource.MustParse("4Gi")
version = "0.8.0-rc3"
version = "0.8.0-rc4"
})
It("should succeed and update the cluster, excluding the version", func() {
_, err := plugin.CreateOrUpdateOpensearchCluster(context.Background(), request)
Expand All @@ -250,7 +250,7 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() {
return reflect.DeepEqual(object.Spec.NodePools[0], nodePool)
}, timeout, interval).Should(BeTrue())
Expect(object.Spec.Security).To(Equal(security))
Expect(object.Spec.Version).To(Equal("0.8.0-rc3"))
Expect(object.Spec.Version).To(Equal("0.8.0-rc4"))
})
})
Specify("check upgrade available should return false", func() {
Expand All @@ -260,10 +260,10 @@ var _ = Describe("Logging Plugin", Ordered, Label("unit"), func() {
})
XWhen("new version is available", func() {
BeforeEach(func() {
version = "0.8.0-rc3"
version = "0.8.0-rc4"
})
Specify("upgrade available should return true", func() {
Expect(version).To(Equal("0.8.0-rc3"))
Expect(version).To(Equal("0.8.0-rc4"))
response, err := plugin.UpgradeAvailable(context.Background(), nil)
Expect(err).NotTo(HaveOccurred())
Expect(response.UpgradePending).To(BeTrue())
Expand Down