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

1.18 improvement - migrate to stability metrics framework #980

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

Conversation

Sindica
Copy link
Collaborator

@Sindica Sindica commented Feb 9, 2021

In order to enable promethus metrics for KCM, Scheduler, Kubelet, and new metrics for api server, Arktos needs to pick up 1.18 changes mainly from this issue: kubernetes/enhancements#1206
In this PR, we have the following changes:

  1. 1.18 changes to migrate api server, scheduler, KCM, proxy, and kubelet to stability framework
  2. Dependent changes from 1.18 due to item 1
  3. Arktos changes due to item 1. Also need to change Artkos version format from x.x to x.x.x (Plus updated swagger.json to version v0.7.0 for alignment with latest release. Note: we might need to update CI tool to accept this change.)
  4. This PR does not include community later effort to consolidate version codes in various components as this is already a big changes.

@centaurus-cloud-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign yxiong2020
You can assign the PR to them by writing /assign @yxiong2020 in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@Sindica Sindica added this to the v0.8 milestone Feb 9, 2021
(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
kubernetes/kubernetes@099484e
zshihang, Aug 19, 2019

Change-Id: Iacab685a710d8f8d5b80ed0d35e5ccc22bd929cb
kubernetes/kubernetes@9b4b509
BenTheElder, Jun 27, 2019
dependency of 81173
kubernetes/kubernetes@59c4eb2
BenTheElder, Jun 27, 2019
dependency of 81173

# Conflicts:
#	hack/.shellcheck_failures
…apVolumeFunc for csi migration on/off scenarios

kubernetes/kubernetes@db1c077
mucahitkurt, Jul 9, 2019
dependency of 81534
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.
…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
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
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
….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
… for clarity

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

# Conflicts:
#	staging/src/k8s.io/apiserver/pkg/authentication/request/x509/x509.go
…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 force-pushed the 1.18-authbenchmark-metrics-framework-2ndtry branch from 796c3ac to 15fc222 Compare February 9, 2021 22:58
@centaurus-cloud-bot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
To complete the pull request process, please assign yxiong2020
You can assign the PR to them by writing /assign @yxiong2020 in a comment when ready.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants