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

Fix mapping service ports #304

Merged
merged 2 commits into from
Aug 6, 2024
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 Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion bundle.Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions bundle/manifests/saas-operator.clusterserviceversion.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion bundle/metadata/annotations.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion config/manager/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
296 changes: 167 additions & 129 deletions docs/api-reference/reference.asciidoc

Large diffs are not rendered by default.

20 changes: 14 additions & 6 deletions pkg/generators/mappingservice/config/publishing_strategy.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"),
},
},
},
}
}
2 changes: 1 addition & 1 deletion pkg/version/version.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down