Skip to content

Commit

Permalink
Prepare version v0.7.0-dcos-1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
Jan Repnak committed Jul 31, 2018
1 parent dad21f8 commit 1f2cf7d
Show file tree
Hide file tree
Showing 9 changed files with 36 additions and 12 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## v0.7.0-dcos-1.11

* Install DC/OS Packages with Ansible and use Kubernetes as the first example
* Added Ansible module for package installation (https://github.com/dcos-labs/ansible-dcos-module)
* Removed instructions for the SSH tunnel (it's not really needed anymore for the current versions of the Kubernetes package)
* Separate installation of dcos cli and kubectl
* Dedicated Kubernetes role roles/package/kubernetes/ that is using the package install module
* Installs ifconfig to address issues with MESOS-6822
* Update Kubernetes to framework version 1.2.0-1.10.5
* Add support for 6443 port in Terraform
* Replace unsupported docker-py with current docker module.
* Added yum-utils to common tasks
* Bumps docker version to 17.06.2.ce
* Removes Docker live restore because of issues with MESOS-6480

## v0.6.1-dcos-1.11

* Update Kubernetes framework to GA
Expand Down
17 changes: 11 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,21 @@ The installation steps are based on the [Advanced Installation Guide][mesosphere

All development is done on the master branch. Tested versions are identified via git tags. To get started, you can clone or fork this repo:

```
```shell
git clone https://github.com/dcos-labs/ansible-dcos
```

Use `git tag` to list all versions:

```
```shell
git tag
v0.6.1-dcos-1.11
v0.7.0-dcos-1.11
```

Check out the latest version with:

```
git checkout v0.6.1-dcos-1.11
```shell
git checkout v0.7.0-dcos-1.11
```

## Install
Expand All @@ -38,17 +38,21 @@ Here are guides to follow to install the DC/OS cluster:
* [On GCP with Terraform/Ansible](docs/INSTALL_GCP.md)

Here are guides to follow to install `framework as-a-service`:

* [Kubernetes as-a-Service](docs/INSTALL_KUBERNETES.md)

## Operational tasks

Upgrade the DC/OS cluster:

* [Upgrade DC/OS](docs/UPGRADE_DCOS.md)

Change number of DC/OS agents:

* [Add/remove DC/OS agents](docs/DCOS_AGENTS.md)

Upgrade the Kubernetes cluster:

* [Upgrade Kubernetes as-a-Service](docs/INSTALL_KUBERNETES.md#upgrade-kubernetes-on-dcos-package)

## Documentation
Expand All @@ -58,6 +62,7 @@ All documentation for this project is located in the [docs](docs/) directory at
## Acknowledgements

Current maintainers:

* [Jan Repnak][github-jrx]
* [Rimas Mocevicius][github-rimusz]

Expand All @@ -73,7 +78,7 @@ Current maintainers:
[DC/OS][github-dcos], along with this project, are both open source software released under the
[Apache Software License, Version 2.0](LICENSE).

[mesosphere-install]: https://docs.mesosphere.com/1.11/installing/ent/custom/advanced/
[mesosphere-install]: https://docs.mesosphere.com/latest/installing/ent/custom/advanced/
[github-dcos]: https://github.com/dcos/dcos
[github-jrx]: https://github.com/jrx
[github-rimusz]: https://github.com/rimusz
2 changes: 1 addition & 1 deletion docs/INSTALL_AWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ num_of_masters = "1"
num_of_private_agents = "3"
num_of_public_agents = "1"
#
aws_region = "us-west-1"
aws_region = "us-west-2"
aws_bootstrap_instance_type = "m4.large"
aws_master_instance_type = "m4.2xlarge"
aws_agent_instance_type = "m4.2xlarge"
Expand Down
2 changes: 2 additions & 0 deletions docs/INSTALL_AZURE.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ azure_agent_instance_type = "Standard_D4_v2"
azure_public_agent_instance_type = "Standard_D4_v2"
# Inbound Master Access
admin_cidr = "0.0.0.0/0"

ssh_pub_key = "INSERT_AZURE_PUBLIC_KEY_HERE"
```

You can plan the profile with Terraform while referencing:
Expand Down
2 changes: 1 addition & 1 deletion docs/INSTALL_KUBERNETES.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ roles:
To start the package upgrade trigger the play `plays/kubernetes.yml`. The command for that is:

```shell
$ ansible-playbook -i inventory.py plays/kubernetes.yml
$ ansible-playbook plays/kubernetes.yml
```

### Cloud Providers upgrade
Expand Down
4 changes: 2 additions & 2 deletions group_vars/all.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
os_system_updates: False

# DC/OS cluster version
dcos_version: '1.11.3'
dcos_version: '1.11.4'

# If planning to upgrade a previous deployed DC/OS Cluster,
# uncomment the following variable
#dcos_upgrade_from_version: '1.11.2'
#dcos_upgrade_from_version: '1.11.3'

# Download URL for DC/OS
dcos_download: "https://downloads.dcos.io/dcos/stable/{{ dcos_version }}/dcos_generate_config.sh"
Expand Down
2 changes: 1 addition & 1 deletion resources/desired_cluster_profile.aws
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ num_of_masters = "1"
num_of_private_agents = "3"
num_of_public_agents = "1"
#
aws_region = "us-west-1"
aws_region = "us-west-2"
aws_bootstrap_instance_type = "m4.large"
aws_master_instance_type = "m4.2xlarge"
aws_agent_instance_type = "m4.2xlarge"
Expand Down
2 changes: 2 additions & 0 deletions resources/desired_cluster_profile.azure
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,5 @@ azure_public_agent_instance_type = "Standard_D4_v2"
#
# Inbound Master Access
admin_cidr = "0.0.0.0/0"

ssh_pub_key = "INSERT_AZURE_PUBLIC_KEY_HERE"
2 changes: 1 addition & 1 deletion resources/main-k8s-api.tf.azure
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Public Subnet NSG Rule
resource "azurerm_network_security_rule" "public-subnet-kubeapiRule" {
name = "HTTPSKUBEAPI"
priority = 120
priority = 125
direction = "Inbound"
access = "Allow"
protocol = "Tcp"
Expand Down

0 comments on commit 1f2cf7d

Please sign in to comment.