Skip to content
This repository has been archived by the owner on Oct 23, 2024. It is now read-only.

chore: Bump edgelb version #46

Merged
merged 2 commits into from
Jul 3, 2019
Merged

chore: Bump edgelb version #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c23597
chore: Bump edgelb version
Jul 1, 2019
b3fd249
project: Release v0.1.0-alpha.12
Jul 2, 2019
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
10 changes: 10 additions & 0 deletions RELEASE-NOTES.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,16 @@ endif::[]
== Table of Contents
toc::[]

== v0.1.0-alpha.12

=== Breaking changes

* The EdgeLB pool configuration was renamed from cloudProvider.aws.elb to cloudProvider.aws.elbs in version 1.4.0. To use NLB functionality we now require EdgeLB built from master (commit https://github.com/mesosphere/dcos-edge-lb/commit/d3547ca23ba9b4a07b91e33562868b731330c855[d3547ca]) or version 1.4.0.

=== Improvements

* EdgeLB version bump

== v0.1.0-alpha.11

=== Bug fixes
Expand Down
2 changes: 1 addition & 1 deletion docs/deployment/10-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ spec:
priorityClassName: system-node-critical
containers:
- name: dklb
image: mesosphere/dklb:v0.1.0-alpha.11
image: mesosphere/dklb:v0.1.0-alpha.12
imagePullPolicy: Always
args:
- /dklb
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/00-installing.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ To install `dklb`, the following prerequisites must be met:
** DC/OS must be v1.12.0 or later.
** EdgeLB must be built and installed from the https://github.com/mesosphere/dcos-edge-lb/tree/master[`master`] branch.
A stub-universe is available, see https://github.com/mesosphere/dcos-edge-lb#stub-universe[here] for details.
*** EdgeLB https://docs.mesosphere.com/services/edge-lb/1.3/[`v1.3.0`] may be used instead, but some functionality will be missing.
*** EdgeLB https://docs.mesosphere.com/services/edge-lb/1.4/[`v1.4.0`] may be used instead, but some functionality might be missing.
* An https://mesosphere.com/product/kubernetes-engine/[MKE] https://docs.mesosphere.com/services/kubernetes/2.2.0-1.13.3/[`v2.2.0-1.13.3`] (or later) cluster.
** The current kubeconfig context must be configured to point at this cluster.

Expand Down
2 changes: 1 addition & 1 deletion docs/usage/11-provisioning-tcp-cloud-loadbalancers.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ To configure an AWS NLB, the value of the `.cloudProviderConfiguration` field mu
----
{
"aws": {
"elb": [{
"elbs": [{
"type": "NLB",
"name": "<name>",
"internal": <internal>,
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ require (
github.com/imdario/mergo v0.3.6 // indirect
github.com/json-iterator/go v1.1.5 // indirect
github.com/kr/pretty v0.1.0 // indirect
github.com/mesosphere/dcos-edge-lb v1.3.2-0.20190618110118-50a400af8d6f
github.com/mesosphere/dcos-edge-lb v1.3.2-0.20190628160932-d3547ca23ba9
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there no 1.4.0 tag?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's not released yet.

github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/mongodb/mongo-go-driver v0.1.0
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ github.com/mesosphere/dcos-edge-lb v1.3.2-0.20190524045551-0e0d955a0325 h1:gqlVF
github.com/mesosphere/dcos-edge-lb v1.3.2-0.20190524045551-0e0d955a0325/go.mod h1:+p1l5IpJ27w9tnm4MY1yOLHCtu2sh6EoLUPTsGEYrjo=
github.com/mesosphere/dcos-edge-lb v1.3.2-0.20190618110118-50a400af8d6f h1:JM2honGf/OS+14RXRPGc2uOHSjjJVuzouv3UnVLHL4o=
github.com/mesosphere/dcos-edge-lb v1.3.2-0.20190618110118-50a400af8d6f/go.mod h1:+p1l5IpJ27w9tnm4MY1yOLHCtu2sh6EoLUPTsGEYrjo=
github.com/mesosphere/dcos-edge-lb v1.3.2-0.20190628160932-d3547ca23ba9 h1:Pkf3sS2A6RC+JIC5j1HtiCvaHzE8OWeZ8zE8uBxJ2EU=
github.com/mesosphere/dcos-edge-lb v1.3.2-0.20190628160932-d3547ca23ba9/go.mod h1:+p1l5IpJ27w9tnm4MY1yOLHCtu2sh6EoLUPTsGEYrjo=
github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
Expand Down
2 changes: 1 addition & 1 deletion make/edgelb.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ EDGELB_PACKAGE_NAME := edgelb
EDGELB_SERVICE_ACCOUNT_NAME := edgelb-principal

# EDGELB_PACKAGE_VERSION sets the required package version
EDGELB_PACKAGE_VERSION := v1.3.1-235-g50a400a
EDGELB_PACKAGE_VERSION := v1.3.1-269-g316af7d

.PHONY: edgelb.package.install
edgelb.package.install: dcos.setup-security.edgelb
Expand Down
48 changes: 25 additions & 23 deletions pkg/translator/status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,29 +34,31 @@ func computeLoadBalancerStatus(manager manager.EdgeLBManager, poolName string, o
publicIPs = make(map[string]bool)
)
// Add all reported DNS names to the set of DNS names.
for _, elb := range m.Elb {
if elb.DNS != "" {
for _, listener := range elb.Listeners {
// Check whether the target frontend belongs to the Service/Ingress resource being processed.
if listener.LinkFrontend == nil {
continue
}
var (
isOwnedByObj bool
)
switch t := obj.(type) {
case *corev1.Service:
m, err := computeServiceOwnedEdgeLBObjectMetadata(*listener.LinkFrontend)
isOwnedByObj = err == nil && m.IsOwnedBy(t)
case *extsv1beta1.Ingress:
m, err := computeIngressOwnedEdgeLBObjectMetadata(*listener.LinkFrontend)
isOwnedByObj = err == nil && m.IsOwnedBy(t)
default:
return nil
}
// If the target frontend belongs to the Service/Ingress resource being processed, we add the DNS name of the ELB being processed.
if isOwnedByObj {
dnsNames[strings.ToLower(elb.DNS)] = true
if m.Aws != nil {
for _, elb := range m.Aws.Elbs {
if elb.DNS != "" {
for _, listener := range elb.Listeners {
// Check whether the target frontend belongs to the Service/Ingress resource being processed.
if listener.LinkFrontend == nil {
continue
}
var (
isOwnedByObj bool
)
switch t := obj.(type) {
case *corev1.Service:
m, err := computeServiceOwnedEdgeLBObjectMetadata(*listener.LinkFrontend)
isOwnedByObj = err == nil && m.IsOwnedBy(t)
case *extsv1beta1.Ingress:
m, err := computeIngressOwnedEdgeLBObjectMetadata(*listener.LinkFrontend)
isOwnedByObj = err == nil && m.IsOwnedBy(t)
default:
return nil
}
// If the target frontend belongs to the Service/Ingress resource being processed, we add the DNS name of the ELB being processed.
if isOwnedByObj {
dnsNames[strings.ToLower(elb.DNS)] = true
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/service_cloud_loadbalancer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ var _ = Describe("Service", func() {
// Create the desired cloud-provider configuration.
redisCfgBytes, _ := json.Marshal(&models.V2CloudProvider{
Aws: &models.V2CloudProviderAws{
Elb: []*models.V2CloudProviderAwsElb{
Elbs: []*models.V2CloudProviderAwsElb{
{
Internal: pointers.NewBool(false),
Listeners: []*models.V2CloudProviderAwsElbListener{
Expand Down