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.

Sign up for GitHub

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

Jump to bottom

1.18 improvement - migrate to stability metrics framework #980

Open
wants to merge 27 commits into
base: master
Choose a base branch
from
Open

1.18 improvement - migrate to stability metrics framework #980

wants to merge 27 commits into from

Commits on Feb 9, 2021

  1. enable token review when openapi is generated 

    kubernetes/kubernetes@b9c7007
mikedanese, Jul 9, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    82dd579 View commit details
    Browse the repository at this point in the history

  2. fix breaking change 

    kubernetes/kubernetes@f55efb8
lavalamp, Jul 21, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    70a72a7 View commit details
    Browse the repository at this point in the history

  3. bump smd 

    (structured-merge-diff)
kubernetes/kubernetes@3c81a9a
lavalamp, Jul 21, 2019

# Conflicts:
#	go.mod
#	go.sum
#	staging/src/k8s.io/apiextensions-apiserver/go.sum
#	staging/src/k8s.io/apiserver/go.mod
#	staging/src/k8s.io/apiserver/go.sum
#	staging/src/k8s.io/kube-aggregator/go.sum
#	staging/src/k8s.io/legacy-cloud-providers/go.sum
#	staging/src/k8s.io/sample-apiserver/go.sum
#	vendor/modules.txt
#	vendor/sigs.k8s.io/structured-merge-diff/value/value.go
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    acf11bc View commit details
    Browse the repository at this point in the history

  4. implement request cancellation in token transport 

    kubernetes/kubernetes@a42e029
mikedanese, Aug 20, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    7166086 View commit details
    Browse the repository at this point in the history

  5. Arktos copyright config update

    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    9af4591 View commit details
    Browse the repository at this point in the history

  6. inject transformer prefix into metric 

    kubernetes/kubernetes@099484e
zshihang, Aug 19, 2019

Change-Id: Iacab685a710d8f8d5b80ed0d35e5ccc22bd929cb
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    4797290 View commit details
    Browse the repository at this point in the history

  7. fix hack/lib/swagger.sh shellcheck failures 

    kubernetes/kubernetes@a101acc
dependency of 81173
BenTheElder, Jun 27, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    e1495c2 View commit details
    Browse the repository at this point in the history

  8. fix hack/lib/init.sh shellcheck failures 

    kubernetes/kubernetes@9b4b509
BenTheElder, Jun 27, 2019
dependency of 81173
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    881bfbe View commit details
    Browse the repository at this point in the history

  9. fix hack/lib/version.sh shellcheck failures 

    kubernetes/kubernetes@59c4eb2
BenTheElder, Jun 27, 2019
dependency of 81173

# Conflicts:
#	hack/.shellcheck_failures
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    00eb652 View commit details
    Browse the repository at this point in the history

  10. unit tests for the volume plugin name that's used inside GeneratedUnm… 

    …apVolumeFunc for csi migration on/off scenarios

kubernetes/kubernetes@db1c077
mucahitkurt, Jul 9, 2019
dependency of 81534
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    0d98f98 View commit details
    Browse the repository at this point in the history

  11. bump go-grpc-prometheus since 1.2.0 actually exposes the metrics 

    kubernetes/kubernetes@b052c2c

v1.1.0 (which is what we currently use), does not expose metrics which
makes it impossible to migrate.

# Conflicts:
#	staging/src/k8s.io/apiextensions-apiserver/go.sum
#	staging/src/k8s.io/apiserver/go.mod
#	staging/src/k8s.io/apiserver/go.sum
#	staging/src/k8s.io/kube-aggregator/go.sum
#	staging/src/k8s.io/legacy-cloud-providers/go.sum
#	staging/src/k8s.io/sample-apiserver/go.sum
#	vendor/modules.txt

Cherry-pick notes:
. Manually pick up github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 vendor changes:
/hack/pin-dependency.sh github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
/hack/update-vendor.sh
removed SMD code changes as it is not compatible with existing arktos code.
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    e814258 View commit details
    Browse the repository at this point in the history

  12. move version logic directly into the component-base, to simplify lega… 

    …cyregistry logic

kubernetes/kubernetes@b037203
logicalhan, Aug 22, 2019

Cherry-pick notes:
skipped:
staging/src/k8s.io/component-base/metrics/registry.go
staging/src/k8s.io/component-base/metrics/legacyregistry/registry.go
staging/src/k8s.io/component-base/metrics/version.go
staging/src/k8s.io/component-base/metrics/version/base.go
hack/lib/verison.sh

Reason:
Merged 04/2020 perf-test metrics code into arktos on 08/03/2020;
hack/lib/verison.sh changes break arktos-up.sh
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    67febca View commit details
    Browse the repository at this point in the history

  13. duplicate migrated variants of shared metrics into component-base 

    kubernetes/kubernetes@9309f16
logicalhan, Aug 22, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    c0aa1fa View commit details
    Browse the repository at this point in the history

  14. add client-go as a dep of component-base 

    kubernetes/kubernetes@94b612f
logicalhan, Aug 22, 2019

cherry-pick notes:
. manually merged changes in
  staging/publishing/import-restrictions.yaml
  staging/publishing/rules.yaml
. run hack/update-vendor.sh
  picked changes related to this commit
  left rest of update vendor to separate commit
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    eca5fce View commit details
    Browse the repository at this point in the history

  15. migrate kube-apiserver metrics to stability framework 

    kubernetes/kubernetes@466980d
logicalhan, Aug 28, 2019
depends on 80874

# Conflicts:
#	cmd/kube-apiserver/app/BUILD
#	staging/publishing/import-restrictions.yaml
#	staging/src/k8s.io/apiserver/pkg/authentication/request/x509/x509.go
#	staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
#	staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go
#	staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/BUILD
#	staging/src/k8s.io/apiserver/pkg/storage/storagebackend/factory/etcd3.go
#	staging/src/k8s.io/kube-aggregator/go.mod
#	staging/src/k8s.io/kube-aggregator/pkg/controllers/status/BUILD
#	staging/src/k8s.io/legacy-cloud-providers/go.sum
#	vendor/modules.txt

Cherry-pick notes:
The following file needs further change and validation due to merge conflicts and arktos changes:
. staging/src/k8s.io/apiserver/pkg/endpoints/metrics/metrics.go
* staging/src/k8s.io/apiserver/pkg/storage/etcd3/metrics/metrics.go
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    929b666 View commit details
    Browse the repository at this point in the history

  16. Remove extra code accidentally brought in by ETCD 3.3.10 upgrade to 3… 

    ….4.4

Without changes, those code does not compile for stability framework migration.
Those code are not in 1.18 or 2021-2-5 master
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    236e981 View commit details
    Browse the repository at this point in the history

  17. add stability level to aggregator metrics and drop blank line in cmd … 

    …file

kubernetes/kubernetes@6eee64c
logicalhan, Aug 28, 2019
depends on 80874
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    74235cc View commit details
    Browse the repository at this point in the history

  18. add some documentation around the metrics stability migration changes… 

    … for clarity

kubernetes/kubernetes@4e5d906
logicalhan, Aug 28, 2019

# Conflicts:
#	staging/src/k8s.io/apiserver/pkg/authentication/request/x509/x509.go
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    1881936 View commit details
    Browse the repository at this point in the history

  19. add comment about explicitly registering grpcprom client metrics 

    kubernetes/kubernetes@1700a31
logicalhan, Aug 28, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    70302ce View commit details
    Browse the repository at this point in the history

  20. kubelet: add eviction counter to metrics 

    kubernetes/kubernetes@23b69cf
sjenning, Aug 15, 2019
dependency of 81534
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    3c0adec View commit details
    Browse the repository at this point in the history

  21. migrate kubelet's metrics/probes & metrics endpoint to metrics stabil… 

    …ity framework

kubernetes/kubernetes@3a50917
logicalhan, Aug 28, 2019

# Conflicts:
#	pkg/kubelet/kuberuntime/BUILD
#	pkg/kubelet/kuberuntime/instrumented_services_test.go
#	pkg/kubelet/metrics/metrics.go
#	pkg/kubelet/prober/BUILD
#	pkg/kubelet/prober/prober_manager.go
#	pkg/kubelet/server/server.go
#	pkg/volume/util/operationexecutor/BUILD
#	pkg/volume/util/operationexecutor/operation_generator_test.go
#	staging/src/k8s.io/component-base/metrics/processstarttime.go
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    28a918c View commit details
    Browse the repository at this point in the history

  22. add some documentation around the metrics stability migration changes… 

    … for clarity

kubernetes/kubernetes@6f70f78
logicalhan, Aug 28, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    00e66fd View commit details
    Browse the repository at this point in the history

  23. migrate scheduler metrics endpoint to metrics stability framework 

    kubernetes/kubernetes@8da448d
logicalhan, Aug 28, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    433b517 View commit details
    Browse the repository at this point in the history

  24. migrate controller-manager metrics to stability framework 

    kubernetes/kubernetes@59db3ac
logicalhan, Aug 29, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    9ac9340 View commit details
    Browse the repository at this point in the history

  25. migrate kube-proxy metrics to stability framework 

    kubernetes/kubernetes#81626
logicalhan, Aug 29, 2019
    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    75cc0f9 View commit details
    Browse the repository at this point in the history

  26. Copyright and make update due to cherry pick

    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    b4abbee View commit details
    Browse the repository at this point in the history

  27. Fix openapi-spec version. UT fix

    @Sindica
    Sindica committed Feb 9, 2021
    Configuration menu
    Copy the full SHA
    15fc222 View commit details
    Browse the repository at this point in the history