This repository has been archived by the owner on Jan 11, 2023. It is now read-only.
Kubernetes: ensure params vals are bool, with test #3285
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
ghost
assigned
jackfrancis
commented
Jun 15, 2018
| kubernetesHyperkubeSpec = properties.OrchestratorProfile.KubernetesConfig.CustomHyperkubeImage | ||
| dockerEngineVersion := KubeConfigs[k8sVersion]["dockerEngineVersion"] | ||
|
|
||
| if properties.OrchestratorProfile.KubernetesConfig != nil { |
There was a problem hiding this comment.
Re-arranged params assignment so that all kubernetesConfig dereferences are nil-checked.
jackfrancis
commented
Jun 15, 2018
| aciConnectorAddon := getAddonByName(properties.OrchestratorProfile.KubernetesConfig.Addons, DefaultACIConnectorAddonName) | ||
| c = getAddonContainersIndexByName(aciConnectorAddon.Containers, DefaultACIConnectorAddonName) | ||
| if c > -1 { | ||
| addValue(parametersMap, "kubernetesACIConnectorEnabled", helpers.IsTrueBoolPointer(aciConnectorAddon.Enabled)) |
There was a problem hiding this comment.
@amanohar hard to see in this diff, but we're now passing a bool to params and not a pointer
jackfrancis
commented
Jun 15, 2018
| addValue(parametersMap, "kubernetesClusterAutoscalerMemoryLimit", clusterAutoscalerAddon.Containers[c].MemoryLimits) | ||
| addValue(parametersMap, "kubernetesClusterAutoscalerMinNodes", clusterAutoscalerAddon.Config["minNodes"]) | ||
| addValue(parametersMap, "kubernetesClusterAutoscalerMaxNodes", clusterAutoscalerAddon.Config["maxNodes"]) | ||
| addValue(parametersMap, "kubernetesClusterAutoscalerEnabled", helpers.IsTrueBoolPointer(clusterAutoscalerAddon.Enabled)) |
jackfrancis
commented
Jun 15, 2018
| assignKubernetesParameters(containerService.Properties, parametersMap, cloudSpecConfig, DefaultGeneratorCode) | ||
| for k, v := range parametersMap { | ||
| switch val := v.(paramsMap)["value"].(type) { | ||
| case *bool: |
There was a problem hiding this comment.
This test iterates through all testdata api models, and then performs the params assignment, and then ensures that there are no *bool type values.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: CecileRobertMichon, jackfrancis The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Codecov Report
@@ Coverage Diff @@
## master #3285 +/- ##
==========================================
- Coverage 53.31% 52.65% -0.67%
==========================================
Files 104 104
Lines 15574 15580 +6
==========================================
- Hits 8304 8204 -100
- Misses 6537 6646 +109
+ Partials 733 730 -3 |
amanohar
approved these changes
Jun 19, 2018
PaulCharlton
added a commit
to ElementAnalytics/acs-engine
that referenced
this pull request
Jun 20, 2018
* 'master' of https://github.com/Azure/acs-engine: (44 commits) remove duplicate ebtables (Azure#3308) Kubernetes: Remove Windows-specific foo for control plane config (Azure#3240) add k8s 1.8.14 (Azure#3303) run /usr/lib/apt/apt.systemd.daily in background (Azure#3304) add annotation to secrets field (Azure#3292) fix(oms): pull oms directly from docker (Azure#3294) ensure params vals are bool, with test (Azure#3285) udpate to latest 16.04 LTS image (Azure#3286) Enable openshift e2e tests on centos (Azure#2910) remove docker dependency from hyperkube extract (Azure#3296) remove pathological test (Azure#3291) Refactor validateDNSPrefix function in one place (Azure#3276) remove unnecessary nil check (Azure#3290) Fixing panic issue in Validate when properties are nil (Azure#3242) Updating the omsagent yaml file to include new changes for node zero dependency (Azure#3277) revert Azure CNI to 1.0.4 (Azure#3289) Add e2e test for openshift vnet (Azure#3274) Support upgrading a Kubernetes cluster that contains Virtual Machine Scale Sets (Azure#3223) Set extension for custom DNS (Azure#3264) don't exit CSE on apt.systemd.daily error (Azure#3278) ...
jackfrancis
added a commit
that referenced
this pull request
Jun 21, 2018
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.
What this PR does / why we need it: Explicitly pass in a bool (not *bool) to params to ensure we never have a type mismatch between ARM and golang
Which issue this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close that issue when PR gets merged): fixes #3279Special notes for your reviewer:
If applicable:
Release note: