Skip to content

Commit

Permalink
Check and update lb metadata (#49)
Browse files Browse the repository at this point in the history
* add metadata config to check state of the loadbalancer

Signed-off-by: Matt Siwiec <[email protected]>

* integrate metadata to keep track of loadbalancer state

Signed-off-by: Matt Siwiec <[email protected]>

* go 1.21 base

Signed-off-by: Matt Siwiec <[email protected]>

---------

Signed-off-by: Matt Siwiec <[email protected]>
  • Loading branch information
rizzza authored Dec 6, 2023
1 parent c374bdf commit fb52f8e
Show file tree
Hide file tree
Showing 13 changed files with 306 additions and 199 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.20 as build
FROM golang:1.21 as build

WORKDIR /go/src/app
COPY . .
Expand Down
2 changes: 2 additions & 0 deletions chart/loadbalancer-provider-haproxy/templates/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ data:
LOADBALANCERPROVIDERHAPROXY_API_ENDPOINT: "{{ .Values.provider.api.endpoint }}"
LOADBALANCERPROVIDERHAPROXY_IPAM_ENDPOINT: "{{ .Values.provider.ipam.endpoint }}"
LOADBALANCERPROVIDERHAPROXY_IPBLOCK: "{{ .Values.provider.ipBlock }}"
LOADBALANCERPROVIDERHAPROXY_METADATA_STATUS_NAMESPACE_ID: "{{ .Values.provider.metadata.statusNamespaceID }}"
LOADBALANCERPROVIDERHAPROXY_METADATA_ENDPOINT: "{{ .Values.provider.metadata.endpoint }}"
LOADBALANCERPROVIDERHAPROXY_OIDC_CLIENT_ISSUER: "{{ .Values.provider.api.oidc.client.issuer }}"
{{- if .Values.provider.tracing.enabled }}
LOADBALANCERPROVIDERHAPROXY_TRACING_ENABLED: "{{ .Values.provider.tracing.enabled }}"
Expand Down
5 changes: 5 additions & 0 deletions chart/loadbalancer-provider-haproxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,11 @@ provider:
location: ""
# amount of times to retry a failed message before discarding it. 0 means msg will always be nacked on failure to process
maxMsgProcessAttempts: 0
metadata:
# statusNamespaceID is the metadata status namespace ID housing loadbalancer status
statusNamespaceID: ""
# endpoint metadata-api endpoint
endpoint: ""
tracing:
# enabled is true if OpenTelemetry tracing should be enabled for load-balancer-operator
enabled: false
Expand Down
15 changes: 12 additions & 3 deletions cmd/process.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (

"go.infratographer.com/ipam-api/pkg/ipamclient"
lbapi "go.infratographer.com/load-balancer-api/pkg/client"
metadata "go.infratographer.com/metadata-api/pkg/client"
"go.infratographer.com/x/echox"
"go.infratographer.com/x/events"
"go.infratographer.com/x/oauth2x"
Expand All @@ -33,9 +34,7 @@ var processCmd = &cobra.Command{
},
}

var (
processDevMode bool
)
var processDevMode bool

func init() {
// only available as a CLI arg because it shouldn't be something that could accidentially end up in a config file or env var
Expand All @@ -59,6 +58,12 @@ func init() {
processCmd.PersistentFlags().String("ipblock", "", "ip block id to use for requesting load balancer IPs")
viperx.MustBindFlag(viper.GetViper(), "ipblock", processCmd.PersistentFlags().Lookup("ipblock"))

processCmd.Flags().String("metadata-status-namespace-id", "", "loadbalancer metadata status namespace id")
viperx.MustBindFlag(viper.GetViper(), "metadata.status-namespace-id", processCmd.Flags().Lookup("metadata-status-namespace-id"))

processCmd.Flags().String("metadata-endpoint", "", "metadata-api endpoint")
viperx.MustBindFlag(viper.GetViper(), "metadata.endpoint", processCmd.Flags().Lookup("metadata-endpoint"))

events.MustViperFlags(viper.GetViper(), processCmd.Flags(), appName)
oauth2x.MustViperFlags(viper.GetViper(), processCmd.Flags())
otelx.MustViperFlags(viper.GetViper(), processCmd.Flags())
Expand Down Expand Up @@ -115,9 +120,13 @@ func process(ctx context.Context, logger *zap.SugaredLogger) error {
server.IPAMClient = ipamclient.NewClient((viper.GetString("ipam-endpoint")),
ipamclient.WithHTTPClient(oauthHTTPClient),
)
server.MetadataClient = metadata.New(config.AppConfig.Metadata.Endpoint,
metadata.WithHTTPClient(oauthHTTPClient),
)
} else {
server.APIClient = lbapi.NewClient((viper.GetString("api-endpoint")))
server.IPAMClient = ipamclient.NewClient((viper.GetString("ipam-endpoint")))
server.MetadataClient = metadata.New(config.AppConfig.Metadata.Endpoint)
}

if err := server.Run(cx); err != nil {
Expand Down
89 changes: 44 additions & 45 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
module go.infratographer.com/loadbalancer-provider-haproxy

go 1.20
go 1.21

require (
github.com/mitchellh/go-homedir v1.1.0
github.com/spf13/cobra v1.8.0
github.com/spf13/viper v1.17.0
github.com/stretchr/testify v1.8.4
go.infratographer.com/ipam-api v0.0.4
go.infratographer.com/load-balancer-api v0.0.26
go.infratographer.com/x v0.3.8
go.opentelemetry.io/otel v1.16.0
go.infratographer.com/load-balancer-api v0.0.36-0.20231201160449-63fdc7abfac5
go.infratographer.com/metadata-api v0.0.4-0.20231117162412-b428513be7b6
go.infratographer.com/x v0.3.9
go.opentelemetry.io/otel v1.21.0
go.uber.org/zap v1.26.0
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa
)

require (
Expand All @@ -22,77 +23,75 @@ require (
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/felixge/httpsnoop v1.0.3 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/go-logr/logr v1.2.4 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-logr/logr v1.3.0 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gobwas/ws v1.0.4 // indirect
github.com/golang-jwt/jwt v3.2.2+incompatible // indirect
github.com/golang-jwt/jwt/v5 v5.0.0 // indirect
github.com/golang-jwt/jwt/v5 v5.1.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.2 // indirect
github.com/google/uuid v1.4.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hasura/go-graphql-client v0.10.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jaevor/go-nanoid v1.3.0 // indirect
github.com/klauspost/compress v1.17.0 // indirect
github.com/klauspost/compress v1.17.3 // indirect
github.com/labstack/echo-contrib v0.15.0 // indirect
github.com/labstack/echo-jwt/v4 v4.2.0 // indirect
github.com/labstack/echo/v4 v4.11.1 // indirect
github.com/labstack/gommon v0.4.0 // indirect
github.com/labstack/echo/v4 v4.11.3 // indirect
github.com/labstack/gommon v0.4.1 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/minio/highwayhash v1.0.2 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/nats-io/jwt/v2 v2.4.1 // indirect
github.com/nats-io/nats-server/v2 v2.9.19 // indirect
github.com/nats-io/nats.go v1.30.2 // indirect
github.com/nats-io/nkeys v0.4.5 // indirect
github.com/nats-io/jwt/v2 v2.5.2 // indirect
github.com/nats-io/nats-server/v2 v2.10.4 // indirect
github.com/nats-io/nats.go v1.31.0 // indirect
github.com/nats-io/nkeys v0.4.6 // indirect
github.com/nats-io/nuid v1.0.1 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_golang v1.16.0 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.11.1 // indirect
github.com/prometheus/client_golang v1.17.0 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/shurcooL/graphql v0.0.0-20230714182844-3e04114ae69a // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/spf13/jwalterweatherman v1.1.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
github.com/stretchr/objx v0.5.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasttemplate v1.2.2 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.42.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.42.0 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/sdk v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.opentelemetry.io/contrib/instrumentation/github.com/labstack/echo/otelecho v0.46.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
go.opentelemetry.io/otel/exporters/jaeger v1.17.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0 // indirect
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.21.0 // indirect
go.opentelemetry.io/otel/metric v1.21.0 // indirect
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
go.opentelemetry.io/otel/trace v1.21.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.13.0 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/crypto v0.15.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/oauth2 v0.13.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230913181813-007df8e322eb // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
google.golang.org/grpc v1.58.2 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/grpc v1.59.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit fb52f8e

Please sign in to comment.