SDK2: Update containerservice to v6 #3906
Open
+20,756
−9,676
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jaitaiwan
force-pushed
the
jaitaiwan/ARO-11234
branch
3 times, most recently
from
92e1bf3
to
c905ee2
Compare
|
Please rebase pull request. |
jaitaiwan
force-pushed
the
jaitaiwan/ARO-11234
branch
from
c905ee2
to
e231e69
Compare
jaitaiwan
requested review from
jewzaam,
bennerv,
hawkowl,
rogbas,
petrkotas,
jharrington22,
cblecker,
cadenmarchese,
UlrichSchlueter,
SudoBrendan,
yjst2012,
anshulvermapatel,
hlipsig,
tiguelu,
SrinivasAtmakuri,
mociarain,
kimorris27,
tsatam,
bitoku and
fahlmant
as code owners
kimorris27
previously requested changes
Oct 28, 2024
pkg/util/azureclient/mgmt/containerservice/managedcluster_addons.go
Outdated
Show resolved
Hide resolved
pkg/util/azureclient/mgmt/containerservice/managedcluster_addons.go
Outdated
Show resolved
Hide resolved
|
Please rebase pull request. |
|
Thanks for the review @kimorris27. We're planning on doing an integration test when all the track 2 PRs are ready by recreating the australiaeast environment (which is already broken and blocked by the need to go to track 2). Apart from that, I haven't been able to come up with a good way to test it further. |
jaitaiwan
force-pushed
the
jaitaiwan/ARO-11234
branch
from
e304644
to
21e569d
Compare
jaitaiwan
force-pushed
the
jaitaiwan/ARO-11234
branch
from
dad3969
to
d0871e2
Compare
|
/azp run ci |
|
Azure Pipelines successfully started running 1 pipeline(s). |
kimorris27
reviewed
Nov 5, 2024
|
/azp run e2e |
|
Azure Pipelines successfully started running 1 pipeline(s). |
kimorris27
approved these changes
Nov 5, 2024
bitoku
reviewed
Nov 6, 2024
|
|
||
| res, err := managedClustersClient.ListClusterAdminCredentials(ctx, aksResourceGroup, aksClusterName, "public") | ||
| res, err := managedClustersClient.ListClusterAdminCredentials(ctx, aksResourceGroup, aksClusterName) |
There was a problem hiding this comment.
why do we need to delete "public"?
| "github.com/Azure/go-autorest/autorest/to" | ||
| "go.uber.org/mock/gomock" | ||
| azfake "github.com/Azure/azure-sdk-for-go/sdk/azcore/fake" | ||
| "github.com/Azure/azure-sdk-for-go/sdk/azcore/to" |
There was a problem hiding this comment.
This is not a blocker for PR, but there's "k8s.io/utils/ptr" usages in other places.
We should discuss which we should use.
Comment on lines
+97
to
+126
| if resultPage == nil { | ||
| t.Fatal(errors.New("result page is nil")) | ||
| } | ||
|
|
||
| hasMore := resultPage.More() | ||
| if !hasMore { | ||
| t.Fatal(errors.New("result page has no results")) | ||
| } | ||
|
|
||
| results, err := resultPage.NextPage(ctx) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if len(results.Value) != len(managedClustersList) { | ||
| t.Fatal(errors.New("results page has an invalid number of results")) | ||
| } | ||
|
|
||
| if *results.Value[0].Name != *managedClustersList[0].Name { | ||
| t.Logf("expected %s to match %s", *results.Value[0].Name, *managedClustersList[0].Name) | ||
| t.Fatal(errors.New("expected name of first managed clusters list to match first page results")) | ||
| } | ||
|
|
||
| adminCredsResult, err := mcc.ListClusterAdminCredentials(ctx, "rp-eastus", "aro-ak-cluster-001") | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| if len(adminCredsResult.CredentialResults.Kubeconfigs) != 1 { | ||
| t.Fatal(errors.New("invalid number of credentials returned")) | ||
| } |
There was a problem hiding this comment.
nit: Do we want to exit the test when it fails? or just t.Fail or t.Error will do?
https://pkg.go.dev/testing#T.Fail
https://pkg.go.dev/testing#T.Fatal
| @@ -75,12 +75,15 @@ func (c *core) Logger() *logrus.Entry { | |||
| } | |||
|
|
|||
| func (c *core) NewLiveConfigManager(ctx context.Context) (liveconfig.Manager, error) { | |||
| msiAuthorizer, err := c.NewMSIAuthorizer(c.Environment().ResourceManagerScope) | |||
| tokenizer, err := c.NewMSITokenCredential() | |||
There was a problem hiding this comment.
super nit: Should it be tokenizer or token? I guess token is better.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue this PR addresses:
Currently a shared rp deployment fails because the azure sdk's in use are out of support. This brings us back up to the latest version.