Merge pull request #258 from vitalykorolev/MLE-14797_migrate-docker-repo

vitalykorolev · web-flow · commit 4d9b86f1e410 · 2024-06-26T11:24:49.000-07:00
MLE-14712 update docker repo
diff --git a/README.md b/README.md
@@ -46,15 +46,15 @@ Refer to the official Kubernetes documentation for detailed steps on how to [cre
 
 4. Create a `values.yaml` file to customize the settings. Specify the number of pods (one MarkLogic host in this case), add the secret name for the admin credentials (if not using the automatically generated one), and specify the resources that should be allocated to each MarkLiogic pod.
 
-Note: Please ensure to use the latest MarkLogic Docker image for the new implementation as specified in the values.yaml file below. Refer to [https://hub.docker.com/r/marklogicdb/marklogic-db/tags](https://hub.docker.com/r/marklogicdb/marklogic-db/tags) for the latest image available.
+Note: Please ensure to use the latest MarkLogic Docker image for the new implementation as specified in the values.yaml file below. Refer to [https://hub.docker.com/r/progressofficial/marklogic-db/tags](https://hub.docker.com/r/progressofficial/marklogic-db/tags) for the latest image available.
 ```
 # Create a single MarkLogic pod
 replicaCount: 1
 
 # Marklogic image parameters
 # using the latest image 11.0.3-centos-1.0.2 
 image:
-  repository: marklogicdb/marklogic-db;
+  repository: progressofficial/marklogic-db;
   tag: 11.0.3-centos-1.0.2 
   pullPolicy: IfNotPresent
 
@@ -119,7 +119,7 @@ Following table lists all the parameters supported by the latest MarkLogic Helm
 | `group.name`                                        | Group name for joining MarkLogic cluster                                                                                                                                               | `Default`                  |
 | `group.enableXdqpSsl`                               | SSL encryption for XDQP                                                                                                                                                                | `true`                     |
 | `bootstrapHostName`                                 | Host name of MarkLogic bootstrap host (to join a cluster)                                                                                                                              | `""`                       |
-| `image.repository`                                  | Repository for MarkLogic image                                                                                                                                                         | `marklogicdb/marklogic-db` |
+| `image.repository`                                  | Repository for MarkLogic image                                                                                                                                                         | `progressofficial/marklogic-db` |
 | `image.tag`                                         | Image tag for MarkLogic image                                                                                                                                                          | `11.2.0-centos-1.1.2`      |
 | `image.pullPolicy`                                  | Image pull policy for MarkLogic image                                                                                                                                                  | `IfNotPresent`             |
 | `initContainers.configureGroup.image`               | Image for configureGroup InitContainer                                                                                                                                                 | `curlimages/curl:8.6.0`    |
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -44,7 +44,7 @@ rootToRootlessUpgrade: false
 
 ## Marklogic image parameters
 image:
-  repository: marklogicdb/marklogic-db
+  repository: progressofficial/marklogic-db
   tag: 11.2.0-ubi-rootless
   pullPolicy: IfNotPresent
 
diff --git a/docs/Local_Development_Tutorial.md b/docs/Local_Development_Tutorial.md
@@ -21,9 +21,9 @@ This tutorial describes how to set up local Kubernetes development environment w
 
 ## Prerequisites
 The following steps assume you are running this tutorial from a desktop environment.
-- [Docker](https://docs.docker.com/engine/install/): Pull the latest MarkLogic Server image from: https://hub.docker.com/r/marklogicdb/marklogic-db
+- [Docker](https://docs.docker.com/engine/install/): Pull the latest MarkLogic Server image from: https://hub.docker.com/r/progressofficial/marklogic-db
   ```sh
-  docker pull marklogicdb/marklogic-db:latest
+  docker pull progressofficial/marklogic-db:latest
   ```
 - [Kubectl](https://kubernetes.io/docs/tasks/tools/):  Download and install this tool to assist with debugging in a Kubernetes environment.
 - [Helm](https://helm.sh/docs/intro/install/):  Clone or download the chart repository: https://github.com/marklogic/marklogic-kubernetes
@@ -53,7 +53,7 @@ minikube   Ready    control-plane,master   1d    v1.23.3
 
 ##  Installing a Single MarkLogic Host to Minikube
 - Push the image used for MarkLogic Server to the Minikube:
-`minikube image load marklogicdb/marklogic-db:latest`
+`minikube image load progressofficial/marklogic-db:latest`
 - Add the Helm repository
   `helm repo add marklogic https://marklogic.github.io/marklogic-kubernetes/`  
   Additionally create a `values.yaml` file for your installation, like the one found in the repository under `/charts`: https://marklogic.github.io/marklogic-kubernetes/. The `values.yaml` file controls configuration for MarkLogic Server running in kubernetes. 
@@ -107,7 +107,7 @@ Events:
   Type     Reason     Age   From               Message
   ----     ------     ----  ----               -------
   Normal   Scheduled  13m   default-scheduler  Successfully assigned default/marklogic-0 to minikube
-  Normal   Pulled     13m   kubelet            Container image "marklogicdb/marklogic-db:latest" already present on machine
+  Normal   Pulled     13m   kubelet            Container image "progressofficial/marklogic-db:latest" already present on machine
   Normal   Created    13m   kubelet            Created container marklogic
   Normal   Started    13m   kubelet            Started container marklogic
   Warning  Unhealthy  13m   kubelet            Startup probe failed: ls: cannot access /var/opt/MarkLogic/ready: No such file or directory
diff --git a/makefile b/makefile
@@ -82,7 +82,7 @@ lint:
 #***************************************************************************
 ## Run all end to end tests
 ## Options:
-## * [dockerImage] optional. default is marklogicdb/marklogic-db:latest. Example: dockerImage=marklogic-centos/marklogic-server-centos:10-internal
+## * [dockerImage] optional. default is progressofficial/marklogic-db:latest. Example: dockerImage=marklogic-centos/marklogic-server-centos:10-internal
 ## * [prevDockerImage] optional. used for marklogic upgrade tests
 ## * [kubernetesVersion] optional. Default is v1.25.8. Used for testing kubernetes version compatibility
 ## * [saveOutput] optional. Save the output to a xml file. Example: saveOutput=true
@@ -186,7 +186,7 @@ template-test: prepare
 #***************************************************************************
 ## Run all tests
 ## Options:
-## * [dockerImage] optional. default is marklogicdb/marklogic-db:latest. Example: dockerImage=marklogic-centos/marklogic-server-centos:10-internal
+## * [dockerImage] optional. default is progressofficial/marklogic-db:latest. Example: dockerImage=marklogic-centos/marklogic-server-centos:10-internal
 ## * [kubernetesVersion] optional. Default is v1.25.8. Used for testing kubernetes version compatibility
 ## * [saveOutput] optional. Save the output to a xml file. Example: saveOutput=true
 .PHONY: test
diff --git a/test/e2e/clustering_test.go b/test/e2e/clustering_test.go
@@ -30,7 +30,7 @@ func TestClusterJoin(t *testing.T) {
 	imageTag, tagPres := os.LookupEnv("dockerVersion")
 
 	if !repoPres {
-		imageRepo = "marklogicdb/marklogic-db"
+		imageRepo = "progressofficial/marklogic-db"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
diff --git a/test/e2e/path_based_test.go b/test/e2e/path_based_test.go
@@ -173,7 +173,7 @@ func TestPathBasedRoutAppServers(t *testing.T) {
 	imageRepo, repoPres := os.LookupEnv("dockerRepository")
 	imageTag, tagPres := os.LookupEnv("dockerVersion")
 	if !repoPres {
-		imageRepo = "marklogicdb/marklogic-db"
+		imageRepo = "progressofficial/marklogic-db"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
diff --git a/test/e2e/scaling_test.go b/test/e2e/scaling_test.go
@@ -29,7 +29,7 @@ func TestHelmScaleUp(t *testing.T) {
 	password := "admin"
 
 	if !repoPres {
-		imageRepo = "marklogicdb/marklogic-db"
+		imageRepo = "progressofficial/marklogic-db"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
diff --git a/test/e2e/separate_nodes_test.go b/test/e2e/separate_nodes_test.go
@@ -41,7 +41,7 @@ func TestSeparateEDnode(t *testing.T) {
 	}
 
 	if !repoPres {
-		imageRepo = "marklogicdb/marklogic-db"
+		imageRepo = "progressofficial/marklogic-db"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
diff --git a/test/e2e/tls_test.go b/test/e2e/tls_test.go
@@ -33,7 +33,7 @@ func TestTLSEnabledWithSelfSigned(t *testing.T) {
 	password := "admin"
 
 	if !repoPres {
-		imageRepo = "marklogicdb/marklogic-db"
+		imageRepo = "progressofficial/marklogic-db"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
@@ -139,7 +139,7 @@ func TestTLSEnabledWithNamedCert(t *testing.T) {
 	imageRepo, repoPres := os.LookupEnv("dockerRepository")
 	imageTag, tagPres := os.LookupEnv("dockerVersion")
 	if !repoPres {
-		imageRepo = "marklogicdb/marklogic-db"
+		imageRepo = "progressofficial/marklogic-db"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
@@ -326,7 +326,7 @@ func TestTlsOnEDnode(t *testing.T) {
 	}
 
 	if !repoPres {
-		imageRepo = "marklogicdb/marklogic-db"
+		imageRepo = "progressofficial/marklogic-db"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
diff --git a/test/e2e/upgrade_test.go b/test/e2e/upgrade_test.go
@@ -77,7 +77,7 @@ func TestHelmUpgrade(t *testing.T) {
 		SetValues: map[string]string{
 			"persistence.enabled":   "true",
 			"replicaCount":          "2",
-			"image.repository":      "marklogicdb/marklogic-db",
+			"image.repository":      "progressofficial/marklogic-db",
 			"image.tag":             "latest",
 			"logCollection.enabled": "false",
 		},
diff --git a/test/hugePages/huge_pages_test.go b/test/hugePages/huge_pages_test.go
@@ -25,7 +25,7 @@ func TestHugePagesSettings(t *testing.T) {
 	imageTag, tagPres := os.LookupEnv("dockerVersion")
 
 	if !repoPres {
-		imageRepo = "marklogicdb/marklogic-db"
+		imageRepo = "progressofficial/marklogic-db"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
diff --git a/test/template/admin_sec_templ_test.go b/test/template/admin_sec_templ_test.go
@@ -28,7 +28,7 @@ func TestChartTemplateAdminSecret(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":                 "marklogicdb/marklogic-db",
+			"image.repository":                 "progressofficial/marklogic-db",
 			"image.tag":                        "latest",
 			"persistence.enabled":              "false",
 			"containerSecurityContext.enabled": "true",
diff --git a/test/template/env_param_templ_test.go b/test/template/env_param_templ_test.go
@@ -28,7 +28,7 @@ func TestChartTemplateEnableConvertersEnabled(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "marklogicdb/marklogic-db",
+			"image.repository":    "progressofficial/marklogic-db",
 			"image.tag":           "latest",
 			"persistence.enabled": "false",
 			"enableConverters":    "true",
@@ -66,7 +66,7 @@ func TestChartTemplateEnableConvertersDisabled(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "marklogicdb/marklogic-db",
+			"image.repository":    "progressofficial/marklogic-db",
 			"image.tag":           "latest",
 			"persistence.enabled": "false",
 			"enableConverters":    "false",
@@ -105,7 +105,7 @@ func TestChartTemplateLicenseValues(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "marklogicdb/marklogic-db",
+			"image.repository":    "progressofficial/marklogic-db",
 			"image.tag":           "latest",
 			"persistence.enabled": "false",
 			"license.key":         "Test License Key",
@@ -148,7 +148,7 @@ func TestChartTemplateAuthRealmValue(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "marklogicdb/marklogic-db",
+			"image.repository":    "progressofficial/marklogic-db",
 			"image.tag":           "latest",
 			"persistence.enabled": "false",
 			"realm":               "public",
diff --git a/test/template/hugePg_template_test.go b/test/template/hugePg_template_test.go
@@ -27,7 +27,7 @@ func TestChartTemplateHugePagesConfig(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":               "marklogicdb/marklogic-db",
+			"image.repository":               "progressofficial/marklogic-db",
 			"image.tag":                      "latest",
 			"persistence.enabled":            "true",
 			"logCollection.enabled":          "true",
diff --git a/test/template/network_templ_test.go b/test/template/network_templ_test.go
@@ -28,7 +28,7 @@ func TestChartTemplateNetworkPolicyEnabled(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":      "marklogicdb/marklogic-db",
+			"image.repository":      "progressofficial/marklogic-db",
 			"image.tag":             "latest",
 			"persistence.enabled":   "false",
 			"networkPolicy.enabled": "true",
diff --git a/test/template/pod_priority_templ_test.go b/test/template/pod_priority_templ_test.go
@@ -28,7 +28,7 @@ func TestChartTemplatePodPriorityClass(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "marklogicdb/marklogic-db",
+			"image.repository":    "progressofficial/marklogic-db",
 			"image.tag":           "latest",
 			"persistence.enabled": "false",
 			"priorityClassName":   "high-priority",
diff --git a/test/template/sec_template_test.go b/test/template/sec_template_test.go
@@ -28,7 +28,7 @@ func TestChartTemplateSecurityEnabled(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":                 "marklogicdb/marklogic-db",
+			"image.repository":                 "progressofficial/marklogic-db",
 			"image.tag":                        "latest",
 			"persistence.enabled":              "false",
 			"containerSecurityContext.enabled": "true",
@@ -68,7 +68,7 @@ func TestChartTemplateSecurityDisabled(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":                 "marklogicdb/marklogic-db",
+			"image.repository":                 "progressofficial/marklogic-db",
 			"image.tag":                        "latest",
 			"persistence.enabled":              "false",
 			"containerSecurityContext.enabled": "false",
diff --git a/test/template/template_test.go b/test/template/template_test.go
@@ -28,7 +28,7 @@ func TestChartTemplateNoLogCollection(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":      "marklogicdb/marklogic-db",
+			"image.repository":      "progressofficial/marklogic-db",
 			"image.tag":             "latest",
 			"persistence.enabled":   "false",
 			"logCollection.enabled": "false",
@@ -46,7 +46,7 @@ func TestChartTemplateNoLogCollection(t *testing.T) {
 	require.Equal(t, namespaceName, statefulset.Namespace)
 
 	// Verify the image matches
-	expectedImage := "marklogicdb/marklogic-db:latest"
+	expectedImage := "progressofficial/marklogic-db:latest"
 	statefulSetContainers := statefulset.Spec.Template.Spec.Containers
 	require.Equal(t, len(statefulSetContainers), 1)
 	require.Equal(t, statefulSetContainers[0].Image, expectedImage)
@@ -66,7 +66,7 @@ func TestChartTemplateLogCollection(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":      "marklogicdb/marklogic-db",
+			"image.repository":      "progressofficial/marklogic-db",
 			"image.tag":             "latest",
 			"persistence.enabled":   "true",
 			"logCollection.enabled": "true",
@@ -85,7 +85,7 @@ func TestChartTemplateLogCollection(t *testing.T) {
 	require.Equal(t, namespaceName, statefulset.Namespace)
 
 	// Verify the image matches
-	expectedImage1 := "marklogicdb/marklogic-db:latest"
+	expectedImage1 := "progressofficial/marklogic-db:latest"
 	expectedImage2 := "fluent/fluent-bit:2.2.2"
 
 	statefulSetContainers := statefulset.Spec.Template.Spec.Containers
@@ -111,7 +111,7 @@ func TestTemplatePersistence(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository": "marklogicdb/marklogic-db",
+			"image.repository": "progressofficial/marklogic-db",
 			"image.tag":        "latest",
 			"additionalVolumeClaimTemplates[0].metadata.name":                   additionalVolumeClaimTemplatesName,
 			"additionalVolumeClaimTemplates[0].spec.accessModes[0]":             additionalVolumeClaimTemplatesAccessModes,
diff --git a/test/template/tls_param_template_test.go b/test/template/tls_param_template_test.go
@@ -27,7 +27,7 @@ func TestChartTemplateTLSEnabled(t *testing.T) {
 	imageRepo, repoPres := os.LookupEnv("dockerRepository")
 	imageTag, tagPres := os.LookupEnv("dockerVersion")
 	if !repoPres {
-		imageRepo = "marklogicdb/marklogic-db"
+		imageRepo = "progressofficial/marklogic-db"
 		t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)
 	}
 
@@ -87,7 +87,7 @@ func TestChartTemplateTLSDisabled(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":              "marklogicdb/marklogic-db",
+			"image.repository":              "progressofficial/marklogic-db",
 			"image.tag":                     "latest",
 			"persistence.enabled":           "false",
 			"tls.enableOnDefaultAppServers": "false",
diff --git a/test/template/topology_spread_constraints_templ_test.go b/test/template/topology_spread_constraints_templ_test.go
@@ -28,7 +28,7 @@ func TestChartTemplateTopologySpreadConstraintClass(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "marklogicdb/marklogic-db",
+			"image.repository":    "progressofficial/marklogic-db",
 			"image.tag":           "latest",
 			"persistence.enabled": "false",
 		},
diff --git a/test/template/upgrade_templ_test.go b/test/template/upgrade_templ_test.go
@@ -28,7 +28,7 @@ func TestChartTemplateUpgradeStrategy(t *testing.T) {
 	// Setup the args for helm install
 	options := &helm.Options{
 		SetValues: map[string]string{
-			"image.repository":    "marklogicdb/marklogic-db",
+			"image.repository":    "progressofficial/marklogic-db",
 			"image.tag":           "latest",
 			"persistence.enabled": "false",
 			"updateStrategy.type": "RollingUpdate",
diff --git a/values.yaml b/values.yaml
@@ -0,0 +1,16 @@
+replicaCount: 2
+ 
+auth:
+  adminUsername: "admin"
+  adminPassword: "admin"
+ 
+persistence:
+  enabled: false
+ 
+image:
+  repository: ml-docker-db-dev-tierpoint.bed-artifactory.bedford.progress.com/marklogic/marklogic-server-ubi-rootless
+  tag: latest-11
+ 
+tls:
+  enableOnDefaultAppServers: true
+

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func TestClusterJoin(t *testing.T) {`
`30`	`30`	`imageTag, tagPres := os.LookupEnv("dockerVersion")`
`31`	`31`
`32`	`32`	`if !repoPres {`
`33`		`- imageRepo = "marklogicdb/marklogic-db"`
	`33`	`+ imageRepo = "progressofficial/marklogic-db"`
`34`	`34`	`t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)`
`35`	`35`	`}`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ func TestPathBasedRoutAppServers(t *testing.T) {`
`173`	`173`	`imageRepo, repoPres := os.LookupEnv("dockerRepository")`
`174`	`174`	`imageTag, tagPres := os.LookupEnv("dockerVersion")`
`175`	`175`	`if !repoPres {`
`176`		`- imageRepo = "marklogicdb/marklogic-db"`
	`176`	`+ imageRepo = "progressofficial/marklogic-db"`
`177`	`177`	`t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)`
`178`	`178`	`}`
`179`	`179`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func TestHelmScaleUp(t *testing.T) {`
`29`	`29`	`password := "admin"`
`30`	`30`
`31`	`31`	`if !repoPres {`
`32`		`- imageRepo = "marklogicdb/marklogic-db"`
	`32`	`+ imageRepo = "progressofficial/marklogic-db"`
`33`	`33`	`t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ func TestSeparateEDnode(t *testing.T) {`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`if !repoPres {`
`44`		`- imageRepo = "marklogicdb/marklogic-db"`
	`44`	`+ imageRepo = "progressofficial/marklogic-db"`
`45`	`45`	`t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)`
`46`	`46`	`}`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func TestTLSEnabledWithSelfSigned(t *testing.T) {`
`33`	`33`	`password := "admin"`
`34`	`34`
`35`	`35`	`if !repoPres {`
`36`		`- imageRepo = "marklogicdb/marklogic-db"`
	`36`	`+ imageRepo = "progressofficial/marklogic-db"`
`37`	`37`	`t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)`
`38`	`38`	`}`
`39`	`39`
`@@ -139,7 +139,7 @@ func TestTLSEnabledWithNamedCert(t *testing.T) {`
`139`	`139`	`imageRepo, repoPres := os.LookupEnv("dockerRepository")`
`140`	`140`	`imageTag, tagPres := os.LookupEnv("dockerVersion")`
`141`	`141`	`if !repoPres {`
`142`		`- imageRepo = "marklogicdb/marklogic-db"`
	`142`	`+ imageRepo = "progressofficial/marklogic-db"`
`143`	`143`	`t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)`
`144`	`144`	`}`
`145`	`145`
`@@ -326,7 +326,7 @@ func TestTlsOnEDnode(t *testing.T) {`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`if !repoPres {`
`329`		`- imageRepo = "marklogicdb/marklogic-db"`
	`329`	`+ imageRepo = "progressofficial/marklogic-db"`
`330`	`330`	`t.Logf("No imageRepo variable present, setting to default value: " + imageRepo)`
`331`	`331`	`}`
`332`	`332`