Skip to content

Commit

Permalink
Target Allocator implementation (Part 3 - Collector Enhancement for P…
Browse files Browse the repository at this point in the history 
…rometheus Config Update) (open-telemetry#389)

* load balancer deployment implementation & controller & e2e tests

* Load balancer crd update, reconcile logic and e2e tests

* Reset last commit and only uploading changes to main.go

* Updated bundle and api with new autogenerated resources

* Updated code with lint fixes

* Updated code to include minor fixes

* Update helper.go to add header

* Updated comment and bundles

* Updated lb reconcile helper function and its invocations

* Updated naming scheme and changed CR config

* Updated bundle files

* Minor changes

* Lint and default file fixes

* Added rolebinding to automate manual setting

* Update opentelemetry-operator.clusterserviceversion.yaml

* Removed role/rolebinding files & Minor changes

* Minor changes

* Added error check in configmap reconcile & spelling correction

* Updated target allocator KUTTL tests & renamed folder

* Updated folder structure to reduce code duplication between collector and targetallocator & Minor changes

* Updated kuttl tests to use namespace-scope resources

* Revert part of "Updated folder structure to reduce code duplication between collector and targetallocator & Minor changes"

This reverts commit 367c623 - only the folder structure change

* Removed separate controller for target allocation

* Added additional label for collector pod selection and removed test-step

* Minor changes

* Added collector enhancement for prometheus config update

* Update config_replace.go

* Squashed commit of the following:

commit a7764b9
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Tue Aug 10 20:20:32 2021 -0700

    Added version management & Minor fixes

* Updated port and protocol

* Lint fixes

* Removed unnecessary structs

* Squashed commit of the following:

commit a496825
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Wed Aug 11 14:53:36 2021 -0400

    Update api/v1alpha1/opentelemetrycollector_webhook.go

    Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>

commit 3d37148
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Wed Aug 11 10:34:44 2021 -0700

    Added validation in webhook to validate prometheus config

commit 33cb042
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Wed Aug 11 07:16:45 2021 -0700

    Updated docker image to quay.io image

commit a7764b9
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Tue Aug 10 20:20:32 2021 -0700

    Added version management & Minor fixes

* Updated structure to reflect new changes in first part

* Squashed commit of the following:

commit 98acb2f
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Thu Aug 12 05:35:53 2021 -0700

    Updated struct name & minor changes

commit a496825
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Wed Aug 11 14:53:36 2021 -0400

    Update api/v1alpha1/opentelemetrycollector_webhook.go

    Co-authored-by: Anthony Mirabella <a9@aneurysm9.com>

commit 3d37148
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Wed Aug 11 10:34:44 2021 -0700

    Added validation in webhook to validate prometheus config

commit 33cb042
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Wed Aug 11 07:16:45 2021 -0700

    Updated docker image to quay.io image

commit a7764b9
Author: Rahul Varma <rahvarm@amazon.com>
Date:   Tue Aug 10 20:20:32 2021 -0700

    Added version management & Minor fixes

* Merged with main branch

* Minor changes

* Updated go.sum

* Updated go.mod

Co-authored-by: Alexis Perez <perzmen@amazon.com>
Co-authored-by: Rahul Varma <rahvarm@amazon.com>
  • Loading branch information
@rsvarma95 @alexperez52
3 people authored and hero committed Dec 12, 2021
1 parent cfdf322 commit b20a74f
Show file tree
Hide file tree
Showing 12 changed files with 1,242 additions and 24 deletions.
68 changes: 62 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ go 1.17
require (
github.com/Masterminds/semver/v3 v3.1.1
github.com/go-logr/logr v0.4.0
github.com/mitchellh/mapstructure v1.4.1
github.com/prometheus/prometheus v1.8.2-0.20210621150501-ff58416a0b02
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.7.0
gopkg.in/yaml.v2 v2.4.0
Expand All @@ -16,43 +18,97 @@ require (
)

require (
cloud.google.com/go v0.54.0 // indirect
cloud.google.com/go v0.83.0 // indirect
github.com/Azure/azure-sdk-for-go v55.2.0+incompatible // indirect
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
github.com/Azure/go-autorest/autorest v0.11.19 // indirect
github.com/Azure/go-autorest/autorest/adal v0.9.14 // indirect
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
github.com/Azure/go-autorest/autorest/to v0.4.0 // indirect
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
github.com/Azure/go-autorest/logger v0.2.1 // indirect
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
github.com/Microsoft/go-winio v0.4.16 // indirect
github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
github.com/armon/go-metrics v0.3.3 // indirect
github.com/aws/aws-sdk-go v1.38.60 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/containerd/containerd v1.4.3 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/digitalocean/godo v1.62.0 // indirect
github.com/docker/distribution v2.7.1+incompatible // indirect
github.com/docker/docker v20.10.7+incompatible // indirect
github.com/docker/go-connections v0.4.0 // indirect
github.com/docker/go-units v0.4.0 // indirect
github.com/evanphx/json-patch v4.11.0+incompatible // indirect
github.com/fatih/color v1.9.0 // indirect
github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/go-kit/log v0.1.0 // indirect
github.com/go-logfmt/logfmt v0.5.0 // indirect
github.com/go-logr/zapr v0.4.0 // indirect
github.com/go-resty/resty/v2 v2.1.1-0.20191201195748-d7b97669fe48 // indirect
github.com/go-zookeeper/zk v1.0.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/go-cmp v0.5.5 // indirect
github.com/google/go-cmp v0.5.6 // indirect
github.com/google/go-querystring v1.0.0 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/googleapis/gax-go/v2 v2.0.5 // indirect
github.com/googleapis/gnostic v0.5.5 // indirect
github.com/gophercloud/gophercloud v0.18.0 // indirect
github.com/hashicorp/consul/api v1.8.1 // indirect
github.com/hashicorp/go-cleanhttp v0.5.1 // indirect
github.com/hashicorp/go-hclog v0.12.2 // indirect
github.com/hashicorp/go-immutable-radix v1.2.0 // indirect
github.com/hashicorp/go-rootcerts v1.0.2 // indirect
github.com/hashicorp/golang-lru v0.5.4 // indirect
github.com/hashicorp/serf v0.9.5 // indirect
github.com/hetznercloud/hcloud-go v1.26.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/jpillora/backoff v1.0.0 // indirect
github.com/json-iterator/go v1.1.11 // indirect
github.com/linode/linodego v0.28.5 // indirect
github.com/mattn/go-colorable v0.1.6 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/miekg/dns v1.1.42 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.1 // indirect
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.0.1 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_golang v1.11.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.26.0 // indirect
github.com/prometheus/common v0.29.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
github.com/scaleway/scaleway-sdk-go v1.0.0-beta.7.0.20210223165440-c65ae3540d44 // indirect
github.com/sirupsen/logrus v1.7.0 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/atomic v1.8.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
go.uber.org/zap v1.18.1 // indirect
golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // indirect
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 // indirect
golang.org/x/net v0.0.0-20210610132358-84b48f89b13b // indirect
golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c // indirect
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c // indirect
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
golang.org/x/text v0.3.6 // indirect
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
google.golang.org/api v0.48.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20210604141403-392c879c8b08 // indirect
google.golang.org/grpc v1.38.0 // indirect
google.golang.org/protobuf v1.26.0 // indirect
gopkg.in/fsnotify/fsnotify.v1 v1.4.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
k8s.io/apiextensions-apiserver v0.21.3 // indirect
Expand Down
Loading

0 comments on commit b20a74f

Please sign in to comment.