From 5686ec993c32c62fda3ce4653f42e996a35b989a Mon Sep 17 00:00:00 2001 From: David Swan Date: Wed, 19 Aug 2020 11:17:12 +0100 Subject: [PATCH 1/2] (IAC-982) - PDK Update --- Gemfile | 2 -- Rakefile | 13 ++++++------- metadata.json | 6 +++--- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index 46773f56..510c7a05 100644 --- a/Gemfile +++ b/Gemfile @@ -30,8 +30,6 @@ group :development do gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw] gem "ruby-pwsh", require: false gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2') - gem 'ed25519', '>= 1.2', '< 2.0' - gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0' end group :system_tests do gem "puppet-module-posix-system-r#{minor_version}", require: false, platforms: [:ruby] diff --git a/Rakefile b/Rakefile index f6422c98..2ece0340 100644 --- a/Rakefile +++ b/Rakefile @@ -53,7 +53,7 @@ if Bundler.rubygems.find_name('github_changelog_generator').any? config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)." config.add_pr_wo_labels = true config.issues = false - config.merge_prefix = "### UNCATEGORIZED PRS; GO LABEL THEM" + config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB" config.configure_sections = { "Changed" => { "prefix" => "### Changed", @@ -61,11 +61,11 @@ if Bundler.rubygems.find_name('github_changelog_generator').any? }, "Added" => { "prefix" => "### Added", - "labels" => ["feature", "enhancement"], + "labels" => ["enhancement", "feature"], }, "Fixed" => { "prefix" => "### Fixed", - "labels" => ["bugfix"], + "labels" => ["bug", "documentation", "bugfix"], }, } end @@ -73,16 +73,15 @@ else desc 'Generate a Changelog from GitHub' task :changelog do raise <= Gem::Version.new('2.2.2')" + version: '~> 1.15' + condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')" EOM end end diff --git a/metadata.json b/metadata.json index d8334fba..8db254b2 100644 --- a/metadata.json +++ b/metadata.json @@ -73,7 +73,7 @@ "version_requirement": ">= 5.5.10 < 7.0.0" } ], - "pdk-version": "1.17.0", - "template-url": "https://github.com/puppetlabs/pdk-templates#master", - "template-ref": "heads/master-0-g095317c" + "pdk-version": "1.18.1", + "template-url": "https://github.com/puppetlabs/pdk-templates#main", + "template-ref": "remotes/origin/main-0-g8f10887" } From 586842df42e735cb41e1555f6935df9f39329f07 Mon Sep 17 00:00:00 2001 From: David Swan Date: Wed, 19 Aug 2020 11:17:12 +0100 Subject: [PATCH 2/2] (IAC-982) - Remove inappropriate terminology --- .github/workflows/release.yml | 6 +++--- .github/workflows/weekly.yml | 6 +++--- README.md | 10 +++++----- REFERENCE.md | 6 +++--- lib/puppet/type/docker_network.rb | 2 +- spec/acceptance_swarm/swarm_spec.rb | 2 +- tasks/swarm_token.json | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59ade7e7..23a45c28 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -21,7 +21,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Litmus Parallel - uses: puppetlabs/action-litmus_parallel@master + uses: puppetlabs/action-litmus_parallel@main with: platform: ${{ matrix.platform }} agent_family: ${{ matrix.agent_family }} @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Litmus Parallel - uses: puppetlabs/action-litmus_parallel@master + uses: puppetlabs/action-litmus_parallel@main with: platform: ${{ matrix.platform }} agent_family: ${{ matrix.agent_family }} @@ -61,7 +61,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Spec Tests - uses: puppetlabs/action-litmus_spec@master + uses: puppetlabs/action-litmus_spec@main with: puppet_gem_version: ${{ matrix.puppet_gem_version }} check: ${{ matrix.check }} diff --git a/.github/workflows/weekly.yml b/.github/workflows/weekly.yml index bd35f7e2..a8097b9c 100644 --- a/.github/workflows/weekly.yml +++ b/.github/workflows/weekly.yml @@ -20,7 +20,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Litmus Parallel - uses: puppetlabs/action-litmus_parallel@master + uses: puppetlabs/action-litmus_parallel@main with: platform: ${{ matrix.platform }} agent_family: ${{ matrix.agent_family }} @@ -40,7 +40,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Litmus Parallel - uses: puppetlabs/action-litmus_parallel@master + uses: puppetlabs/action-litmus_parallel@main with: platform: ${{ matrix.platform }} agent_family: ${{ matrix.agent_family }} @@ -60,7 +60,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: Spec Tests - uses: puppetlabs/action-litmus_spec@master + uses: puppetlabs/action-litmus_spec@main with: puppet_gem_version: ${{ matrix.puppet_gem_version }} check: ${{ matrix.check }} diff --git a/README.md b/README.md index 9ee9cda4..a8a96e7b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-docker.svg?branch=master)](https://travis-ci.org/puppetlabs/puppetlabs-docker) +[![Build Status](https://travis-ci.org/puppetlabs/puppetlabs-docker.svg?branch=main)](https://travis-ci.org/puppetlabs/puppetlabs-docker) [![Puppet Forge](https://img.shields.io/puppetforge/v/puppetlabs/docker.svg)](https://forge.puppetlabs.com/puppetlabs/docker) [![Puppet Forge Downloads](http://img.shields.io/puppetforge/dt/puppetlabs/docker.svg)](https://forge.puppetlabs.com/puppetlabs/docker) [![Puppet Forge Endorsement](https://img.shields.io/puppetforge/e/puppetlabs/docker.svg)](https://forge.puppetlabs.com/puppetlabs/docker) @@ -655,11 +655,11 @@ To supply multiple overide compose files add the following to the manifest file: ```puppet docker_compose {'test': - compose_files => ['master-docker-compose.yml', 'override-compose.yml'], + compose_files => ['server-docker-compose.yml', 'override-compose.yml'], } ``` -Please note you should supply your master docker-compose file as the first element in the array. As per docker, multi compose file support compose files are merged in the order they are specified in the array. +Please note you should supply your server docker-compose file as the first element in the array. As per docker, multi compose file support compose files are merged in the order they are specified in the array. If you are using a v3.2 compose file or above on a Docker Swarm cluster, use the `docker::stack` class. Include the file resource before you run the stack command. @@ -1000,7 +1000,7 @@ docker::plugin {'foo/fooplugin:latest' ## Reference -For information on classes, types and functions see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-docker/blob/master/REFERENCE.md). +For information on classes, types and functions see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-docker/blob/main/REFERENCE.md). ## Limitations @@ -1018,7 +1018,7 @@ This module supports: ## Development -If you would like to contribute to this module, see the guidelines in [CONTRIBUTING.MD](https://github.com/puppetlabs/puppetlabs-docker/blob/master/CONTRIBUTING.md). +If you would like to contribute to this module, see the guidelines in [CONTRIBUTING.MD](https://github.com/puppetlabs/puppetlabs-docker/blob/main/CONTRIBUTING.md). ## Acceptance diff --git a/REFERENCE.md b/REFERENCE.md index 81a31985..90d2e1b7 100644 --- a/REFERENCE.md +++ b/REFERENCE.md @@ -73,7 +73,7 @@ from the registry * [`swarm_init`](#swarm_init): Initializes a swarm * [`swarm_join`](#swarm_join): Join a swarm * [`swarm_leave`](#swarm_leave): Leave a swarm -* [`swarm_token`](#swarm_token): Gets the swarm token from the master +* [`swarm_token`](#swarm_token): Gets the swarm token from the server * [`swarm_update`](#swarm_update): Updates an existing service. ## Classes @@ -3544,7 +3544,7 @@ Auxiliary ipv4 or ipv6 addresses used by the Network driver ##### `gateway` -An ipv4 or ipv6 gateway for the master subnet +An ipv4 or ipv6 gateway for the server subnet ##### `ip_range` @@ -4139,7 +4139,7 @@ Force this node to leave the swarm, ignoring warnings ### `swarm_token` -Gets the swarm token from the master +Gets the swarm token from the server **Supports noop?** false diff --git a/lib/puppet/type/docker_network.rb b/lib/puppet/type/docker_network.rb index 56cdcf5d..d8145b49 100644 --- a/lib/puppet/type/docker_network.rb +++ b/lib/puppet/type/docker_network.rb @@ -18,7 +18,7 @@ end newparam(:gateway) do - desc 'An ipv4 or ipv6 gateway for the master subnet' + desc 'An ipv4 or ipv6 gateway for the server subnet' end newparam(:ip_range) do diff --git a/spec/acceptance_swarm/swarm_spec.rb b/spec/acceptance_swarm/swarm_spec.rb index b159a9ce..f39a6c80 100644 --- a/spec/acceptance_swarm/swarm_spec.rb +++ b/spec/acceptance_swarm/swarm_spec.rb @@ -72,7 +72,7 @@ class { 'docker': #{docker_args} } end end - context 'Creating a swarm master' do + context 'Creating a swarm server' do let(:token) { shell('docker swarm join-token -q worker').stdout.strip } it 'is idempotent' do diff --git a/tasks/swarm_token.json b/tasks/swarm_token.json index 30735123..b5c3cf00 100644 --- a/tasks/swarm_token.json +++ b/tasks/swarm_token.json @@ -1,5 +1,5 @@ { - "description": "Gets the swarm token from the master", + "description": "Gets the swarm token from the server", "input_method": "stdin", "parameters": { "node_role": {