Release prep v3.3.0

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b315980bd61b22a12038fafaf81795e7694c745c..5e0d0842e56f1a02b4c14fcac1c1fb793e67c67e 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,14 +2,22 @@
 
 All 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).
 
-## Unversioned
+## [v3.3.0](https://github.com/puppetlabs/puppetlabs-firewall/tree/v3.3.0) (2021-12-15)
 
-### iptables.rb
+[Full Changelog](https://github.com/puppetlabs/puppetlabs-firewall/compare/v3.2.0...v3.3.0)
 
-There are cases where spaces and quotes in iptables comments generated by
-mainstream sources (e.g. podman) were causing rules to not parse properly.
-We didn't fix the whole problem, but we removed those comments for parsing
-purposes.
+### Added
+
+- pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#1020](https://github.com/puppetlabs/puppetlabs-firewall/pull/1020) ([david22swan](https://github.com/david22swan))
+- pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#1017](https://github.com/puppetlabs/puppetlabs-firewall/pull/1017) ([david22swan](https://github.com/david22swan))
+
+### Fixed
+
+- Bugfix MODULES-11203: error on second apply when uid or gid is specified as a range [\#1019](https://github.com/puppetlabs/puppetlabs-firewall/pull/1019) ([cmd-ntrf](https://github.com/cmd-ntrf))
+- Fedora 34 and iptables-compat fix; properly utilising iptables param. [\#1018](https://github.com/puppetlabs/puppetlabs-firewall/pull/1018) ([adamboutcher](https://github.com/adamboutcher))
+- pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#1015](https://github.com/puppetlabs/puppetlabs-firewall/pull/1015) ([david22swan](https://github.com/david22swan))
+- Add carp protocol to :proto property [\#1014](https://github.com/puppetlabs/puppetlabs-firewall/pull/1014) ([adrianiurca](https://github.com/adrianiurca))
+- \(MODULES-6876\) lib/puppet/provider/firewall/iptables.rb - comments cleanup for parsing [\#981](https://github.com/puppetlabs/puppetlabs-firewall/pull/981) ([tskirvin](https://github.com/tskirvin))
 
 ## [v3.2.0](https://github.com/puppetlabs/puppetlabs-firewall/tree/v3.2.0) (2021-09-06)
 
@@ -52,7 +60,6 @@ purposes.
 
 - Fixed link to REFERENCE.md [\#993](https://github.com/puppetlabs/puppetlabs-firewall/pull/993) ([Samgarr](https://github.com/Samgarr))
 - Update README.md [\#986](https://github.com/puppetlabs/puppetlabs-firewall/pull/986) ([arjenz](https://github.com/arjenz))
->>>>>>> upstream/main
 
 ## [v3.0.0](https://github.com/puppetlabs/puppetlabs-firewall/tree/v3.0.0) (2021-03-01)
 

diff --git a/REFERENCE.md b/REFERENCE.md
index 6646ba8d66f388e2b25dd5f64f8632ed386f1724..b7831fd7b5e13093072f479f83a45a05b80ea269 100644 (file)
--- a/REFERENCE.md
+++ b/REFERENCE.md
@@ -996,7 +996,7 @@ This would cover ports 1 to 1024.
 
 ##### `proto`
 
-Valid values: `[:ip, :tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :igmp, :ipencap, :ipv4, :ipv6, :ospf, :gre, :cbt, :sctp, :pim, :all].map { |proto|
+Valid values: `[:ip, :tcp, :udp, :icmp, :"ipv6-icmp", :esp, :ah, :vrrp, :carp, :igmp, :ipencap, :ipv4, :ipv6, :ospf, :gre, :cbt, :sctp, :pim, :all].map { |proto|
       [proto, "! #{proto}".to_sym]
     }.flatten`
 

diff --git a/metadata.json b/metadata.json
index d4a5b55dbdc948851e2f55056a21322e5124bfea..c9e998302a9ad043d7c846976f1614c45534acc1 100644 (file)
--- a/metadata.json
+++ b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppetlabs-firewall",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "author": "puppetlabs",
   "summary": "Manages Firewalls such as iptables",
   "license": "Apache-2.0",

diff --git a/pdk.yaml b/pdk.yaml
new file mode 100644 (file)
index 0000000..4bef4bd
--- /dev/null
+++ b/pdk.yaml
@@ -0,0 +1,2 @@
+---
+ignore: []