Merge pull request #304 from 3scale-ops/fix-mapping-service-ports

Fix mapping service ports
3scale-ops · Aug 6, 2024 · a10ed06 · a10ed06
2 parents 7569ab6 + 49d7523
commit a10ed06
Show file tree

Hide file tree

Showing 8 changed files with 192 additions and 144 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@
 # To re-generate a bundle for another specific version without changing the standard setup, you can:
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
-VERSION ?= 0.25.0-alpha.7
+VERSION ?= 0.25.0
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "candidate,fast,stable")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:

diff --git a/bundle.Dockerfile b/bundle.Dockerfile
diff --git a/bundle/manifests/saas-operator.clusterserviceversion.yaml b/bundle/manifests/saas-operator.clusterserviceversion.yaml
diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/3scale/saas-operator
-  newTag: v0.25.0-alpha.7
+  newTag: v0.25.0
diff --git a/docs/api-reference/reference.asciidoc b/docs/api-reference/reference.asciidoc
diff --git a/pkg/generators/mappingservice/config/publishing_strategy.go b/pkg/generators/mappingservice/config/publishing_strategy.go
@@ -16,12 +16,20 @@ func DefaultPublishingStrategy() []service.ServiceDescriptor {
 				EndpointName: "HTTP",
 				Simple:       &saasv1alpha1.Simple{ServiceType: util.Pointer(saasv1alpha1.ServiceTypeClusterIP)},
 			},
-			PortDefinitions: []corev1.ServicePort{{
-				Name:       "mapping",
-				Protocol:   corev1.ProtocolTCP,
-				Port:       80,
-				TargetPort: intstr.FromString("mapping"),
-			}},
+			PortDefinitions: []corev1.ServicePort{
+				{
+					Name:       "mapping",
+					Protocol:   corev1.ProtocolTCP,
+					Port:       80,
+					TargetPort: intstr.FromString("mapping"),
+				},
+				{
+					Name:       "management",
+					Protocol:   corev1.ProtocolTCP,
+					Port:       8090,
+					TargetPort: intstr.FromString("management"),
+				},
+			},
 		},
 	}
 }
diff --git a/pkg/version/version.go b/pkg/version/version.go
@@ -1,7 +1,7 @@
 package version
 
 const (
-	version string = "v0.25.0-alpha.7"
+	version string = "v0.25.0"
 )
 
 // Current returns the current marin3r operator version