update autoscaling version to v2beta2 #37872

richardwxn · 2022-03-10T23:34:22Z

need to wait for #istio/api#2273 to get in first

address #32005

istio-policy-bot · 2022-03-10T23:34:25Z

😊 Welcome @richardwxn! This is either your first contribution to the Istio istio repo, or it's been
awhile since you've been here.

You can learn more about the Istio working groups, code of conduct, and contributing guidelines
by referring to Contributing to Istio.

Thanks for contributing!

Courtesy of your friendly welcome wagon.

howardjohn

Nice! what happens if someone has an overlay?

manifests/charts/gateways/istio-egress/templates/autoscale.yaml

howardjohn · 2022-03-14T20:54:18Z

@richardwxn the failures look like they are real

richardwxn · 2022-03-15T21:54:43Z

@richardwxn the failures look like they are real

Yep I think we need to check in the istio/api changes first, otherwise it cannot recognize the updated schema, which is the reason why the tests are failing

richardwxn · 2022-03-15T22:23:28Z

Nice! what happens if someone has an overlay?

for helm it should just work since the original values. settings just mapped to a different k8s field.

A bit trickier for k8s overlay cases, since some fields are just removed in the v2beta2/v2 schema, two ideas:

check for k8s version, if older than xxx pick the old template otherwise pick the new template
check for deprecated fields, if using any deprecated fields pick the old template
but either way we need to keep two copies: both v2beta1 and v2, switched in the chart by an internal flag

@howardjohn @ostromart lmk if that makes sense to you

howardjohn · 2022-03-18T19:24:51Z

2 seems slightly better since (1) would still be a breaking change to IOP when a user upgrades their underlying K8s cluster. With 2 they just need to move before they upgrade to 1.25 which removes the old API

richardwxn · 2022-04-08T17:34:17Z

@howardjohn PTAL?

manifests/charts/gateway/templates/hpa.yaml

manifests/charts/gateways/istio-egress/templates/autoscale.yaml

howardjohn · 2022-04-08T20:22:25Z

manifests/charts/gateways/istio-egress/values.yaml

@@ -279,6 +279,9 @@ global:
    # Setting this port to a non-zero value enables STS server.
    servicePort: 0

+  # whether to use autoscaling/v2 template for HPA settings
+  autoscalingv2API: true


Is a user expected to configure this? It would be nice to auto-detect based on their Kubernetes version.

See manifests/charts/gateway/templates/deployment.yaml ip_unprivileged_port_start for an example doing this

it is for internal usage, i.e. we check the existence of deprecated fields usages from user's IOP and set this autoscalingv2API to false, then render the v2beta1 template instead

Can we add a comment to the Helm description saying it's for internal usage? Users look to our Helm values as an API

operator/pkg/helmreconciler/prune.go

operator/pkg/translate/translate.go

samples/addons/kiali.yaml

Monkeyanator · 2022-05-05T23:00:46Z

manifests/charts/gateways/istio-egress/values.yaml

@@ -279,6 +279,9 @@ global:
    # Setting this port to a non-zero value enables STS server.
    servicePort: 0

+  # whether to use autoscaling/v2 template for HPA settings
+  autoscalingv2API: true


Can we add a comment to the Helm description saying it's for internal usage? Users look to our Helm values as an API

manifests/charts/istiod-remote/values.yaml

operator/pkg/helmreconciler/prune.go

Monkeyanator · 2022-05-05T23:39:37Z

operator/pkg/helmreconciler/prune.go

@@ -193,6 +209,7 @@ func (h *HelmReconciler) GetPrunedResources(revision string, includeClusterResou
 		labels[IstioComponentLabelStr] = componentName
 	}
 	selector := klabels.Set(labels).AsSelectorPreValidated()
+	h.modifyPruneResourcesBasedOnK8SVersion()


+1, think we'd have to change this in a few places though?

istio-testing · 2022-05-06T21:01:41Z

In response to a cherrypick label: #37872 failed to apply on top of branch "release-1.14":

Applying: update autoscaling version to v2beta2
Applying: integrate with api repo changes
.git/rebase-apply/patch:2579: trailing whitespace.
          - object: 
.git/rebase-apply/patch:2588: trailing whitespace.
          - resource: 
.git/rebase-apply/patch:2599: trailing whitespace.
          - pods: 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
M	operator/pkg/apis/istio/v1alpha1/values_types.pb.go
Falling back to patching base and 3-way merge...
Auto-merging operator/pkg/apis/istio/v1alpha1/values_types.pb.go
Auto-merging manifests/charts/istio-control/istio-discovery/files/gen-istio.yaml
Auto-merging go.sum
Auto-merging go.mod
Applying: address comments
Using index info to reconstruct a base tree...
M	go.sum
M	operator/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml
M	operator/cmd/mesh/testdata/manifest-generate/output/sidecar_template.golden.yaml
Falling back to patching base and 3-way merge...
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/sidecar_template.golden.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/pilot_default.golden.yaml
Auto-merging operator/cmd/mesh/testdata/manifest-generate/output/all_on.golden-show-in-gh-pull-request.yaml
Auto-merging go.sum
Applying: update helm gateway
Applying: address comments, fix boolean condition
warning: Cannot merge binary files: operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz (HEAD vs. address comments, fix boolean condition)
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz
M	operator/pkg/apis/istio/v1alpha1/values_types.pb.go
Falling back to patching base and 3-way merge...
Auto-merging operator/pkg/apis/istio/v1alpha1/values_types.pb.go
Auto-merging operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz
CONFLICT (content): Merge conflict in operator/cmd/mesh/testdata/manifest-generate/data-snapshot.tar.gz
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0005 address comments, fix boolean condition
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

istio-testing · 2022-05-06T21:01:43Z

In response to a cherrypick label: new issue created for failed cherrypick: #38779

* update autoscaling version to v2beta2 * integrate with api repo changes * address comments * update helm gateway * address comments, fix boolean condition * modify pruning based on k8s version * fix comments

* operator: update golden files (#38714) Currently operator tests use a snapshot of the manifests for tests to avoid churn. Update these to meet current state of the world. All changes are autogenerated * update autoscaling version to v2beta2 (#37872) * update autoscaling version to v2beta2 * integrate with api repo changes * address comments * update helm gateway * address comments, fix boolean condition * modify pruning based on k8s version * fix comments * bump pdb version to policy/v1 (#38814) * add v1 pdb * release note * Remove common-protos (#38546) * Remove common-protos * Make gen Co-authored-by: John Howard <howardjohn@google.com> Co-authored-by: Xinnan Wen <iamwen@google.com> Co-authored-by: Zhonghu Xu <xuzhonghu@huawei.com>

richardwxn requested review from a team as code owners March 10, 2022 23:34

istio-testing added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 10, 2022

howardjohn reviewed Mar 10, 2022

View reviewed changes

manifests/charts/gateways/istio-egress/templates/autoscale.yaml Show resolved Hide resolved

howardjohn mentioned this pull request Mar 21, 2022

bump k8s hpa api mirrored in operator api to v2beta2 istio/api#2273

Merged

richardwxn force-pushed the bump-hpa branch from 6d19e78 to dafdd51 Compare April 6, 2022 17:37

richardwxn requested review from costinm, jacob-delgado and Monkeyanator as code owners April 6, 2022 17:37

richardwxn requested a review from a team April 6, 2022 17:37

richardwxn requested review from linsun, nmittler and ericvn as code owners April 6, 2022 17:37

richardwxn force-pushed the bump-hpa branch from dafdd51 to 6a6feaa Compare April 6, 2022 17:39

richardwxn requested a review from howardjohn April 6, 2022 17:40

richardwxn force-pushed the bump-hpa branch 3 times, most recently from 2dc8119 to d17fa1a Compare April 7, 2022 20:43

richardwxn requested a review from a team as a code owner April 7, 2022 20:43

howardjohn reviewed Apr 8, 2022

View reviewed changes

samples/addons/kiali.yaml Outdated Show resolved Hide resolved

istio-testing added the needs-rebase Indicates a PR needs to be rebased before being merged label Apr 11, 2022

richardwxn force-pushed the bump-hpa branch from d17fa1a to 19c7eac Compare April 14, 2022 00:23

istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label Apr 14, 2022

Monkeyanator reviewed May 5, 2022

View reviewed changes

richardwxn added 7 commits May 6, 2022 11:14

update autoscaling version to v2beta2

13e0855

integrate with api repo changes

d39a879

address comments

1a83a8e

update helm gateway

341eb50

address comments, fix boolean condition

f1c53ab

modify pruning based on k8s version

c52a948

fix comments

98a7064

richardwxn force-pushed the bump-hpa branch from 74fe84c to 98a7064 Compare May 6, 2022 18:47

richardwxn requested a review from a team as a code owner May 6, 2022 18:47

istio-testing removed the needs-rebase Indicates a PR needs to be rebased before being merged label May 6, 2022

lei-tang approved these changes May 6, 2022

View reviewed changes

richardwxn requested a review from Monkeyanator May 6, 2022 20:54

Monkeyanator approved these changes May 6, 2022

View reviewed changes

istio-testing merged commit c3d3d13 into istio:master May 6, 2022

richardwxn added the cherrypick/release-1.14 label May 6, 2022

istio-testing mentioned this pull request May 6, 2022

[release-1.14] update autoscaling version to v2beta2 #38779

Closed

michaelvl mentioned this pull request Jun 21, 2022

CNI chart GKE check using deprecated Helm .Capabilities.KubeVersion.GitVersion object #39534

Closed

richardwxn mentioned this pull request Sep 20, 2022

fix handling of the deprecated autoscaling settings #41079

Merged

triffer mentioned this pull request Feb 23, 2023

Update Istio HPA to autoscaling/v2 kyma-project/kyma#16848

Merged

arka-pramanik-hpe added a commit to arka-pramanik-hpe/cray-istio that referenced this pull request Jun 3, 2024

Update HorizontalPodAutoscaler to autoscaling/v2 (istio/istio#37872)

d8e2bae

arka-pramanik-hpe added a commit to arka-pramanik-hpe/cray-istio that referenced this pull request Jun 14, 2024

Update HorizontalPodAutoscaler to autoscaling/v2 (istio/istio#37872)

b945f54

arka-pramanik-hpe added a commit to arka-pramanik-hpe/cray-istio that referenced this pull request Jun 19, 2024

Update HorizontalPodAutoscaler to autoscaling/v2 (istio/istio#37872)

8961f08

update autoscaling version to v2beta2 #37872

update autoscaling version to v2beta2 #37872

Uh oh!

Conversation

richardwxn commented Mar 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

istio-policy-bot commented Mar 10, 2022

Uh oh!

howardjohn left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

howardjohn commented Mar 14, 2022

Uh oh!

richardwxn commented Mar 15, 2022

Uh oh!

richardwxn commented Mar 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

howardjohn commented Mar 18, 2022

Uh oh!

richardwxn commented Apr 8, 2022

Uh oh!

Uh oh!

Uh oh!

howardjohn Apr 8, 2022

Choose a reason for hiding this comment

Uh oh!

richardwxn Apr 11, 2022

Choose a reason for hiding this comment

Uh oh!

Monkeyanator May 5, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Monkeyanator May 5, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Monkeyanator May 5, 2022

Choose a reason for hiding this comment

Uh oh!

istio-testing commented May 6, 2022

Uh oh!

istio-testing commented May 6, 2022

Uh oh!

Uh oh!

richardwxn commented Mar 10, 2022 •

edited

Loading

richardwxn commented Mar 15, 2022 •

edited

Loading