Skip to content

Commit f01afb5

Browse files
pengzhoumlPeng Zhou
andauthored
MLE-20079: update API version (#73)
Co-authored-by: Peng Zhou <[email protected]>
1 parent 02c524f commit f01afb5

File tree

9 files changed

+13
-13
lines changed

9 files changed

+13
-13
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ kubectl get pods -n marklogic-operator-system
4040
4. Use this command to verify CRDs are correctly installed:
4141
```sh
4242
% kubectl get crd -n marklogic-operator-system | grep 'marklogic'
43-
marklogicclusters.database.marklogic.com 2025-02-18T09:20:59Z
44-
marklogicgroups.database.marklogic.com 2025-02-18T09:21:00Z
43+
marklogicclusters.marklogic.progress.com 2025-02-18T09:20:59Z
44+
marklogicgroups.marklogic.progress.com 2025-02-18T09:21:00Z
4545
```
4646

4747
### Install MarkLogic Cluster

config/samples/minimal-production.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: marklogic.progress.com/v1alpha1
1+
apiVersion: marklogic.progress.com/v1
22
kind: MarklogicCluster
33
metadata:
44
annotations: {}

internal/controller/marklogiccluster_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ var _ = Describe("MarklogicCluster Controller", func() {
7777
mlCluster := &marklogicv1.MarklogicCluster{
7878
TypeMeta: metav1.TypeMeta{
7979
Kind: "MarklogicCluster",
80-
APIVersion: "marklogic.progress.com/v1alpha1",
80+
APIVersion: "marklogic.progress.com/v1",
8181
},
8282
ObjectMeta: metav1.ObjectMeta{
8383
Name: clusterName,

internal/controller/marklogicgroup_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ var _ = Describe("MarkLogicGroup controller", func() {
8888
mlGroup := &marklogicv1.MarklogicGroup{
8989
TypeMeta: metav1.TypeMeta{
9090
Kind: "MarklogicGroup",
91-
APIVersion: "marklogic.progress.com/v1alpha1",
91+
APIVersion: "marklogic.progress.com/v1",
9292
},
9393
ObjectMeta: metav1.ObjectMeta{
9494
Name: Name,

pkg/k8sutil/marklogicServer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func GenerateMarkLogicGroupDef(cr *marklogicv1.MarklogicCluster, index int, para
102102
}
103103
ownerDef := marklogicClusterAsOwner(cr)
104104
MarkLogicGroupDef := &marklogicv1.MarklogicGroup{
105-
TypeMeta: generateTypeMeta("MarklogicGroup", "operator.marklogic.com/v1alpha1"),
105+
TypeMeta: generateTypeMeta("MarklogicGroup", "marklogic.progress.com/v1"),
106106
ObjectMeta: objectMeta,
107107
Spec: marklogicv1.MarklogicGroupSpec{
108108
Replicas: params.Replicas,

test/e2e/2_marklogic_cluster_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ var (
3838
adminPassword = "Admin@8001"
3939
marklogiccluster = &marklogicv1.MarklogicCluster{
4040
TypeMeta: metav1.TypeMeta{
41-
APIVersion: "marklogic.com/v1alpha1",
41+
APIVersion: "marklogic.progress.com/v1",
4242
Kind: "MarklogicCluster",
4343
},
4444
ObjectMeta: metav1.ObjectMeta{

test/e2e/3_ml_cluster_ednode_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ var (
5454
}
5555
mlcluster = &marklogicv1.MarklogicCluster{
5656
TypeMeta: metav1.TypeMeta{
57-
APIVersion: "marklogic.com/v1alpha1",
57+
APIVersion: "marklogic.progress.com/v1",
5858
Kind: "MarklogicCluster",
5959
},
6060
ObjectMeta: metav1.ObjectMeta{

test/e2e/4_tls_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestTlsWithSelfSigned(t *testing.T) {
2929

3030
cr := &marklogicv1.MarklogicCluster{
3131
TypeMeta: metav1.TypeMeta{
32-
APIVersion: "marklogic.com/v1alpha1",
32+
APIVersion: "marklogic.progress.com/v1",
3333
Kind: "MarklogicCluster",
3434
},
3535
ObjectMeta: metav1.ObjectMeta{
@@ -140,7 +140,7 @@ func TestTlsWithNamedCert(t *testing.T) {
140140

141141
cr := &marklogicv1.MarklogicCluster{
142142
TypeMeta: metav1.TypeMeta{
143-
APIVersion: "marklogic.com/v1alpha1",
143+
APIVersion: "marklogic.progress.com/v1",
144144
Kind: "MarklogicCluster",
145145
},
146146
ObjectMeta: metav1.ObjectMeta{
@@ -288,7 +288,7 @@ func TestTlsWithMultiNode(t *testing.T) {
288288

289289
cr := &marklogicv1.MarklogicCluster{
290290
TypeMeta: metav1.TypeMeta{
291-
APIVersion: "marklogic.com/v1alpha1",
291+
APIVersion: "marklogic.progress.com/v1",
292292
Kind: "MarklogicCluster",
293293
},
294294
ObjectMeta: metav1.ObjectMeta{

test/e2e/5_haproxy_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestHAPorxyPathBaseEnabled(t *testing.T) {
2828

2929
cr := &marklogicv1.MarklogicCluster{
3030
TypeMeta: metav1.TypeMeta{
31-
APIVersion: "marklogic.com/v1alpha1",
31+
APIVersion: "marklogic.progress.com/v1",
3232
Kind: "MarklogicCluster",
3333
},
3434
ObjectMeta: metav1.ObjectMeta{
@@ -159,7 +159,7 @@ func TestHAPorxWithNoPathBasedDisabled(t *testing.T) {
159159

160160
cr := &marklogicv1.MarklogicCluster{
161161
TypeMeta: metav1.TypeMeta{
162-
APIVersion: "marklogic.com/v1alpha1",
162+
APIVersion: "marklogic.progress.com/v1",
163163
Kind: "MarklogicCluster",
164164
},
165165
ObjectMeta: metav1.ObjectMeta{

0 commit comments

Comments
 (0)