Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for provisioning single master clusters on Azure through clusterctl #2

Merged
merged 17 commits into from
Aug 10, 2018
Merged

Adds support for provisioning single master clusters on Azure through clusterctl #2

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
612e5c6
refactor wrappers to be in their own directory, add more unit tests
Jul 19, 2018
414e8c8
run gofmt
Jul 19, 2018
279219a
add more tests
Jul 20, 2018
771ddda
bootstrap kubernetes on internal cluster but with no dns
Aug 1, 2018
7f20a84
refactor directory structure
Aug 3, 2018
451efaa
update to support new directory structure
Aug 3, 2018
96c4757
use new controller images and add logging for startup script
Aug 3, 2018
2a35de8
make kuberouter apply correctly in the startup script
Aug 3, 2018
d829cbb
disable password authentication on VMs
Aug 6, 2018
8ada346
move unit testing out of travis_wait
Aug 6, 2018
1ded36e
change testing flags to remove unnecessary logging
Aug 7, 2018
91d81b5
switch go version
Aug 7, 2018
03b1792
fix tests failing to compile in travis due to ignoring key* which unt…
Aug 7, 2018
c827f2a
change test machines to only use one master no node
Aug 7, 2018
4ee9ad5
remove unusued test until support is added
Aug 7, 2018
dc3bfac
specify sshkey is public key, change to use go 1.10.2 in travis, add …
Aug 10, 2018
4f463fc
change to go 1.10.2
Aug 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
generatedconfigs/
.env
kubeconfig
minikube.kubeconfig
.travis.yml
5 changes: 4 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
*.test
.idea/
.env
exampleconfigs/provider-components.yaml
minikube.kubeconfig
generatedconfigs/
generatedconfigs/
sshkey*
kubeconfig
23 changes: 11 additions & 12 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,20 @@
language: go
go:
- 1.10.x
- 1.10.2
jobs:
include:
- stage: Unit Tests
script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -v -run "^TestParseProviderConfig|TestBase64Encoding|TestGetStartupScript|TestGetIPUnit|TestCreateGroupUnit|TestCheckResourceGroupExistsUnit|TestNewMachineActuator$"
script: go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run "^TestParseProviderConfig|TestBase64Encoding|TestGetStartupScript|Test(\w)*Unit|TestNewMachineActuator$"
- stage: Integration Tests
script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestCreate$
- script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestUpdate$
- script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestDelete$
- script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestExists$
- script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestCreateOrUpdateDeployment$
- script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestCreateOrUpdateDeploymentWExisting$
- script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestVMIfExists$
- script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestDeleteSingleVM$
- script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestCreateGroup$
- script: travis_wait 50 go test github.com/platform9/azure-provider -test.timeout 0 -x -run ^TestGetIP$
script: travis_wait 50 go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run ^TestCreate$
- script: travis_wait 50 go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run ^TestUpdate$
- script: travis_wait 50 go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run ^TestDelete$
- script: travis_wait 50 go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run ^TestExists$
- script: travis_wait 50 go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run ^TestCreateOrUpdateDeployment$
- script: travis_wait 50 go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run ^TestCreateOrUpdateDeploymentWExisting$
- script: travis_wait 50 go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run ^TestVMIfExists$
- script: travis_wait 50 go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run ^TestCreateGroup$
- script: travis_wait 50 go test github.com/platform9/azure-provider/cloud/azure/actuators/machine -test.timeout 0 -v -run ^TestGetIP$

notifications:
slack:
Expand Down
27 changes: 25 additions & 2 deletions Gopkg.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GOCMD=go
REPO=github.com/platform9/azure-provider
REPO=github.com/platform9/azure-provider/cloud/azure/actuators/machine
GOBUILD=$(GOCMD) build
GOCLEAN=$(GOCMD) clean
TESTFLAGS=-test.timeout 0 -v
Expand All @@ -8,7 +8,7 @@ GOGET=$(GOCMD) get


unit_test:
$(GOTEST) -run "^TestParseProviderConfig|TestBase64Encoding|TestGetStartupScript|TestGetIPUnit|TestCreateGroupUnit|TestCheckResourceGroupExistsUnit|TestNewMachineActuator"
$(GOTEST) -run "^TestParseProviderConfig|TestBase64Encoding|TestGetStartupScript|Test(\w)*Unit|TestNewMachineActuator"

integration_test:
$(GOTEST) -run "^TestCreate|TestUpdate|TestDelete|TestExists|TestCreateOrUpdateDeployment|TestCreateOrUpdateDeploymentWExisting|TestVMIfExists|TestDeleteSingleVM|TestCreateGroup|TestGetIP"
Expand Down
8 changes: 4 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
4. Run `generate-yaml.sh` _Note: `generate-yaml.sh` creates an Azure service principal which will not be deleted automatically._
5. (Optional) Build a new version of `clusterctl` by running `cd clusterctl && go build && cd ..`
5. Use the configs generated in `generatedconfigs/` with `clusterctl`
* Example: `./clusterctl/clusterctl --provider azure -m generatedconfigs/machines.yaml -c generatedconfigs/cluster.yaml -p generatedconfigs/provider-components.yaml -a generatedconfigs/addons.yaml`
* Example: `./clusterctl/clusterctl create cluster --provider azure -m generatedconfigs/machines.yaml -c generatedconfigs/cluster.yaml -p generatedconfigs/provider-components.yaml -a generatedconfigs/addons.yaml`

## Creating and using controller images
1. [Install docker](https://docs.docker.com/install/#supported-platforms) and ensure docker works with `docker run hello-world`
2. Log into docker with `docker login`
3. Edit `cmd/azure-controller/Makefile` such that `PREFIX` is the logged in user, and `NAME` is the repository you wish to push your images to.
4. While in `cmd/azure-controller/`, run `make push` to create an image and push it to your Docker Hub repository.
5. Edit `generatedconfigs/provider-components.yaml` such that the images for `azure-machine-controller` and `azure-cluster-controller` refer to the images you just pushed, e.g. `meegul/azure-controller:0.0.17-dev`
3. Edit `cmd/machine-controller/Makefile` such that `PREFIX` is the logged in user, and `NAME` is the repository you wish to push your images to.
4. While in `cmd/machine-controller/`, run `make push` to create an image and push it to your Docker Hub repository.
5. Edit `generatedconfigs/provider-components.yaml` such that the images for `azure-machine-controller` and `azure-cluster-controller` refer to the images you just pushed, e.g. `platform9/cluster-api-azure-machine-controller:0.0.17-dev`


## Testing
Expand Down
2 changes: 1 addition & 1 deletion clusteractuator.go → ...zure/actuators/cluster/clusteractuator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

package azure_provider
package cluster

import (
"fmt"
Expand Down
0 deployment-params.json → .../actuators/machine/deployment-params.json
View file
Open in desktop
File renamed without changes.
41 changes: 35 additions & 6 deletions deployment-template.json → ...ctuators/machine/deployment-template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,6 @@
"defaultValue": null,
"type":"string"
},
"vm_password": {
"defaultValue": null,
"type": "string"
},
"vm_size": {
"defaultValue": null,
"type": "string"
Expand All @@ -81,6 +77,10 @@
"startup_script": {
"defaultValue": null,
"type": "string"
},
"sshKeyData": {
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you rename this to sshPublicKey? Or is it ssh_public_key?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Renamed to sshPublicKey

"defaultValue": null,
"type": "string"
}
},
"variables": {},
Expand Down Expand Up @@ -117,9 +117,16 @@
"osProfile": {
"computerName": "[parameters('virtualMachines_ClusterAPIVM_name')]",
"adminUsername": "[parameters('vm_user')]",
"adminPassword": "[parameters('vm_password')]",
"linuxConfiguration": {
"disablePasswordAuthentication": false
"disablePasswordAuthentication": true,
"ssh": {
"publicKeys": [
{
"path": "[concat('/home/', parameters('vm_user'), '/.ssh/authorized_keys')]",
"keyData": "[parameters('sshKeyData')]"
}
]
}
},
"secrets": []
},
Expand Down Expand Up @@ -375,6 +382,28 @@
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_ClusterAPIVM_nsg_name'))]"
]
},
{
"type": "Microsoft.Network/networkSecurityGroups/securityRules",
"name": "[concat(parameters('networkSecurityGroups_ClusterAPIVM_nsg_name'), '/kubernetes')]",
"apiVersion": "2017-06-01",
"scale": null,
"properties": {
"provisioningState": "Succeeded",
"protocol": "TCP",
"sourcePortRange": "*",
"destinationPortRange": "6443",
Copy link
Contributor

Choose a reason for hiding this comment

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

What is this port for? Can you add a comment? Would this be something that a user might want to configure?

"sourceAddressPrefix": "*",
"destinationAddressPrefix": "*",
"access": "Allow",
"priority": 1001,
"direction": "Inbound",
"sourceAddressPrefixes": [],
"destinationAddressPrefixes": []
},
"dependsOn": [
"[resourceId('Microsoft.Network/networkSecurityGroups', parameters('networkSecurityGroups_ClusterAPIVM_nsg_name'))]"
]
},
{
"type": "Microsoft.Network/virtualNetworks/subnets",
"name": "[concat(parameters('virtualNetworks_ClusterAPIVM_vnet_name'), '/', parameters('subnets_default_name'))]",
Expand Down
Loading