This repository has been archived by the owner on Oct 24, 2023. It is now read-only.
chore: update Kubernetes libraries to v0.24.7 #4990
Merged
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
jackfrancis
changed the title
jackfrancis
changed the title
jackfrancis
force-pushed
the
new-client-go
branch
from
2faec1f to
2d54470
Compare
jackfrancis
commented
Nov 2, 2022
| @@ -156,7 +156,7 @@ test: generate | |||
| ginkgo -mod=vendor -skipPackage test/e2e -failFast -r -v -tags=fast -ldflags '$(LDFLAGS)' . | |||
|
|
|||
| .PHONY: test-style | |||
| test-style: validate-go validate-shell validate-copyright-headers | |||
| test-style: validate-go validate-copyright-headers | |||
There was a problem hiding this comment.
@CecileRobertMichon @mboersma this is the change that skips shellcheck
jackfrancis
commented
Nov 2, 2022
| @@ -216,7 +213,7 @@ func TestWriteCustomCloudProfile(t *testing.T) { | |||
| t.Fatalf("failed to write custom cloud profile: can not read file %s ", environmentFilePath) | |||
| } | |||
| azurestackenvironmentStr := string(azurestackenvironment) | |||
| expectedResult := `{"name":"azurestackcloud","managementPortalURL":"https://management.local.azurestack.external/","publishSettingsURL":"https://management.local.azurestack.external/publishsettings/index","serviceManagementEndpoint":"https://management.azurestackci15.onmicrosoft.com/36f71706-54df-4305-9847-5b038a4cf189","resourceManagerEndpoint":"https://management.local.azurestack.external/","activeDirectoryEndpoint":"https://login.windows.net/","galleryEndpoint":"https://portal.local.azurestack.external=30015/","keyVaultEndpoint":"https://vault.azurestack.external/","graphEndpoint":"https://graph.windows.net/","serviceBusEndpoint":"https://servicebus.azurestack.external/","batchManagementEndpoint":"https://batch.azurestack.external/","storageEndpointSuffix":"core.azurestack.external","sqlDatabaseDNSSuffix":"database.azurestack.external","trafficManagerDNSSuffix":"trafficmanager.cn","keyVaultDNSSuffix":"vault.azurestack.external","serviceBusEndpointSuffix":"servicebus.azurestack.external","serviceManagementVMDNSSuffix":"chinacloudapp.cn","resourceManagerVMDNSSuffix":"cloudapp.azurestack.external","containerRegistryDNSSuffix":"azurecr.io","cosmosDBDNSSuffix":"","tokenAudience":"https://management.azurestack.external/","resourceIdentifiers":{"graph":"","keyVault":"","datalake":"","batch":"","operationalInsights":"","storage":""}}` | |||
| expectedResult := `{"name":"azurestackcloud","managementPortalURL":"https://management.local.azurestack.external/","publishSettingsURL":"https://management.local.azurestack.external/publishsettings/index","serviceManagementEndpoint":"https://management.azurestackci15.onmicrosoft.com/36f71706-54df-4305-9847-5b038a4cf189","resourceManagerEndpoint":"https://management.local.azurestack.external/","activeDirectoryEndpoint":"https://login.windows.net/","galleryEndpoint":"https://portal.local.azurestack.external=30015/","keyVaultEndpoint":"https://vault.azurestack.external/","graphEndpoint":"https://graph.windows.net/","serviceBusEndpoint":"https://servicebus.azurestack.external/","batchManagementEndpoint":"https://batch.azurestack.external/","storageEndpointSuffix":"core.azurestack.external","sqlDatabaseDNSSuffix":"database.azurestack.external","trafficManagerDNSSuffix":"trafficmanager.cn","keyVaultDNSSuffix":"vault.azurestack.external","serviceBusEndpointSuffix":"servicebus.azurestack.external","serviceManagementVMDNSSuffix":"chinacloudapp.cn","resourceManagerVMDNSSuffix":"cloudapp.azurestack.external","containerRegistryDNSSuffix":"azurecr.io","cosmosDBDNSSuffix":"","tokenAudience":"https://management.azurestack.external/","apiManagementHostNameSuffix":"","synapseEndpointSuffix":"","resourceIdentifiers":{"graph":"","keyVault":"","datalake":"","batch":"","operationalInsights":"","storage":"","synapse":"","serviceBus":""}}` | |||
There was a problem hiding this comment.
@jadarsie FYI updates to Azure go libs brought in some additional data here, UT have been updated.
Let me know if this is a concern.
There was a problem hiding this comment.
No concerns that I can think of
| @@ -550,7 +550,7 @@ func TestK8sVars(t *testing.T) { | |||
| "apiVersionDeployments": "2018-06-01", | |||
| "apiVersionKeyVault": "2016-10-01", | |||
| "applicationInsightsKey": "c92d8284-b550-4b06-b7ba-e80fd7178faa", // should be DefaultApplicationInsightsKey, | |||
| "environmentJSON": `{"name":"azurestackcloud","managementPortalURL":"https://management.local.azurestack.external/","publishSettingsURL":"https://management.local.azurestack.external/publishsettings/index","serviceManagementEndpoint":"https://management.azurestackci15.onmicrosoft.com/36f71706-54df-4305-9847-5b038a4cf189","resourceManagerEndpoint":"https://management.local.azurestack.external/","activeDirectoryEndpoint":"https://login.windows.net/","galleryEndpoint":"https://portal.local.azurestack.external=30015/","keyVaultEndpoint":"https://vault.azurestack.external/","graphEndpoint":"https://graph.windows.net/","serviceBusEndpoint":"https://servicebus.azurestack.external/","batchManagementEndpoint":"https://batch.azurestack.external/","storageEndpointSuffix":"core.azurestack.external","sqlDatabaseDNSSuffix":"database.azurestack.external","trafficManagerDNSSuffix":"trafficmanager.cn","keyVaultDNSSuffix":"vault.azurestack.external","serviceBusEndpointSuffix":"servicebus.azurestack.external","serviceManagementVMDNSSuffix":"chinacloudapp.cn","resourceManagerVMDNSSuffix":"cloudapp.azurestack.external","containerRegistryDNSSuffix":"azurecr.io","cosmosDBDNSSuffix":"","tokenAudience":"https://management.azurestack.external/","resourceIdentifiers":{"graph":"","keyVault":"","datalake":"","batch":"","operationalInsights":"","storage":""}}`, | |||
| "environmentJSON": `{"name":"azurestackcloud","managementPortalURL":"https://management.local.azurestack.external/","publishSettingsURL":"https://management.local.azurestack.external/publishsettings/index","serviceManagementEndpoint":"https://management.azurestackci15.onmicrosoft.com/36f71706-54df-4305-9847-5b038a4cf189","resourceManagerEndpoint":"https://management.local.azurestack.external/","activeDirectoryEndpoint":"https://login.windows.net/","galleryEndpoint":"https://portal.local.azurestack.external=30015/","keyVaultEndpoint":"https://vault.azurestack.external/","graphEndpoint":"https://graph.windows.net/","serviceBusEndpoint":"https://servicebus.azurestack.external/","batchManagementEndpoint":"https://batch.azurestack.external/","storageEndpointSuffix":"core.azurestack.external","sqlDatabaseDNSSuffix":"database.azurestack.external","trafficManagerDNSSuffix":"trafficmanager.cn","keyVaultDNSSuffix":"vault.azurestack.external","serviceBusEndpointSuffix":"servicebus.azurestack.external","serviceManagementVMDNSSuffix":"chinacloudapp.cn","resourceManagerVMDNSSuffix":"cloudapp.azurestack.external","containerRegistryDNSSuffix":"azurecr.io","cosmosDBDNSSuffix":"","tokenAudience":"https://management.azurestack.external/","apiManagementHostNameSuffix":"","synapseEndpointSuffix":"","resourceIdentifiers":{"graph":"","keyVault":"","datalake":"","batch":"","operationalInsights":"","storage":"","synapse":"","serviceBus":""}}`, | |||
There was a problem hiding this comment.
where is this diff coming from? is it expected? @jadarsie
There was a problem hiding this comment.
It is the result of a change to the data response from a new version of go-autorest. You can actually eye-ball it and see the new "zero value" fields (because the diff is identical until the very end of the string):
- apiManagementHostNameSuffix
- synapseEndpointSuffix
And it looks like new "synapse" and "serviceBus" fields in the "resourceIdentifiers" response dictionary.
| @@ -9,7 +9,7 @@ echo "==> Checking copyright headers <==" | |||
|
|
|||
| files=$(find . -type f -iname '*.go' ! -path './vendor/*' ! -path './hack/tools/*' ! -path './test/e2e/vendor/*') | |||
| licRes=$(for file in $files; do | |||
| awk 'NR<=3' "$file" | grep -Eq "(Copyright|generated|GENERATED)" || echo "$file"; | |||
| awk 'NR<=4' "$file" | grep -Eq "(Copyright|generated|GENERATED)" || echo "$file"; | |||
There was a problem hiding this comment.
what is this change doing?
There was a problem hiding this comment.
golang v1.17 (probably more like gofmt) brings a new canonical build tags format that includes a newline, so there are a few files that have one more line above the grep match pattern than previously.
If I were testing your code review skills you'd get an A+, good job!
CecileRobertMichon
approved these changes
Nov 2, 2022
There was a problem hiding this comment.
lgtm
Thank you for doing this painful but much-needed work @jackfrancis
jadarsie
approved these changes
Nov 2, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Reason for Change:
This PR updates Kubernetes libraries to
v0.24.7, the latest v0.24 version. In addition several related other updates are appropriate to include with this change:go-autorestupdated to v0.11.18 (from v0.9.6)Additionally, these changes brought new versions of go linting and shellcheck. The requested changes to satisfy new go linting requirements were superficial, and have been applied. The suggested changes from shellcheck are to critical areas of the bootstrap scripts, and as such my recommendation is that we ignore them, and deactivate shellcheck from CI altogether based on the deprecation/LTS goal of keeping known-working surface areas as static as possible.
Issue Fixed:
Credit Where Due:
Does this change contain code from or inspired by another project?
If "Yes," did you notify that project's maintainers and provide attribution?
Requirements:
Notes: