Skip to content
This repository has been archived by the owner on Oct 24, 2023. It is now read-only.

fix: Checking return code of curl.exe on Windows #4327

Merged
merged 2 commits into from
Mar 26, 2021

Conversation

marosset
Copy link
Contributor

@marosset marosset commented Mar 11, 2021

Reason for Change:

Fixes an issue where curl.exe can fail silently on Windows.

Issue Fixed:

Fixes the issue discussed at #4319 (comment)

Credit Where Due:

Does this change contain code from or inspired by another project?

  • No
  • Yes

If "Yes," did you notify that project's maintainers and provide attribution?

  • No
  • Yes

Requirements:

Notes:

jackfrancis
jackfrancis previously approved these changes Mar 11, 2021
Copy link
Member

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@codecov
Copy link

codecov bot commented Mar 11, 2021

Codecov Report

Merging #4327 (57671fd) into master (eeab855) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master    #4327   +/-   ##
=======================================
  Coverage   72.07%   72.07%           
=======================================
  Files         141      141           
  Lines       21640    21640           
=======================================
  Hits        15596    15596           
  Misses       5093     5093           
  Partials      951      951           
Impacted Files Coverage Δ
pkg/engine/templates_generated.go 43.56% <ø> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update eeab855...57671fd. Read the comment docs.

@marosset
Copy link
Contributor Author

I'm confused why the CI jobs are failing.

I've deployed two clusters successfully with these changes built on top on current master using the following api model

{
  "apiVersion": "vlabs",
  "location": "westus2",
  "properties": {
    "orchestratorProfile": {
      "orchestratorType": "Kubernetes",
      "orchestratorRelease": "1.20",
      "kubernetesConfig": {
         "containerRuntime": "containerd",
         "windowsContainerdURL": "https://github.com/containerd/containerd/releases/download/v1.4.3/containerd-1.4.3-windows-amd64.tar.gz"
      }
    },
    "featureFlags": {
      "enableTelemetry": true
    },
    "masterProfile": {
      "count": 1,
      "dnsPrefix": "marosset-curl-fixes",
      "vmSize": "Standard_D2s_v3"
    },
    "agentPoolProfiles": [
      {
        "name": "agentwindows",
        "count": 1,
        "vmSize": "Standard_D2s_v3",
        "availabilityProfile": "VirtualMachineScaleSets",
        "osType": "Windows"
      }
    ],
    "windowsProfile": {
      "adminUsername": "azureuser",
      "adminPassword": "password1234$",
      "sshEnabled": true,
      "enableAutomaticUpdates": false
    },
    "linuxProfile": {
      "adminUsername": "azureuser",
      "ssh": {
        "publicKeys": [
          {
            "keyData": ""
          }
        ]
      }
    },
    "servicePrincipalProfile": {
      "clientId": "",
      "secret": ""
    }
  }
}

@jsturtevant
Copy link
Contributor

I tried your branch and I was also able to deploy a cluster.

kubectl --kubeconfig ~/kubeconfig.westus2.json get nodes
NAME                                 STATUS   ROLES    AGE   VERSION
1120k8s00000000                      Ready    agent    40m   v1.20.4
k8s-agentlinux-11200089-vmss000000   Ready    agent    43m   v1.20.4
k8s-master-11200089-0                Ready    master   43m   v1.20.4

@acs-bot
Copy link

acs-bot commented Mar 26, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis, jsturtevant, marosset

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:
  • OWNERS [jackfrancis,jsturtevant,marosset]

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

@jsturtevant jsturtevant merged commit c338e7d into Azure:master Mar 26, 2021
@marosset marosset deleted the windows-check-curl-success branch March 26, 2021 17:02
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants