Skip to content

Commit

Permalink
Merge branch '1.41.0' into merge-1.41.0-to-main
Browse files Browse the repository at this point in the history
  • Loading branch information
aleathersf5 committed Nov 13, 2023
2 parents 7b61ca3 + 9d56368 commit 3adbce8
Show file tree
Hide file tree
Showing 198 changed files with 8,975 additions and 821 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
.vscode
jsconfig.json
*.tfstate*
Expand Down
39 changes: 14 additions & 25 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
image: $DOCKER_URL/node:12-buster
image: $DOCKER_URL/node:20

stages:
- update
Expand Down Expand Up @@ -37,14 +37,23 @@ include:
# adds atg-shared-checks stage and jobs
# adds atg_shared_checks_result job to test stage
- project: automation-toolchain/atg-shared-templates
file: security/base.gitlab-ci.yml
file:
- compliance/base.gitlab-ci.yml
- security/base.gitlab-ci.yml

# Override compliance template job
check_copyrights:
allow_failure: false

# Override compliance template job
lint:
allow_failure: false

update_autotool_deps:
stage: update
rules:
- if: '$UPDATE_DEPS =~ /true/i'
needs: []
image: $DOCKER_URL/node:14
variables:
UPDATE_BRANCH_NAME: update_autotool_deps
script:
Expand All @@ -56,15 +65,6 @@ update_autotool_deps:
fi
tags: [cm-official-docker-executor]

lint:
stage: lint
needs: []
tags:
- cm-official-docker-executor
script:
- npm ci --no-optional
- npm run lint

test_node:4:
stage: test
needs: []
Expand Down Expand Up @@ -131,6 +131,7 @@ test_node:8:
junit: test_report.xml

test_node:latest:
image: $DOCKER_URL/node:16
stage: test
needs: []
tags:
Expand Down Expand Up @@ -183,16 +184,6 @@ coverage:
- public
coverage: /All files[^|]*\|[^|]*\s+([\d\.]+)/

audit:
image: $DOCKER_URL/node:16
needs: []
stage: test
allow_failure: true
tags:
- cm-official-docker-executor
script:
- npm audit

build_rpm:
image: $DOCKER_URL/node:14
stage: build
Expand All @@ -205,9 +196,6 @@ build_rpm:
# setup node environment
- apt-get update && apt-get install -y rpm --no-install-recommends
- scripts/build/buildRpm.sh
# ensure latest copyrights, requires dev dependencies
- npm ci --no-optional
- node node_modules/@f5devcentral/atg-shared-utilities-dev/scripts/dev/write-copyright.js -c -p scripts/dev/copyright.txt
artifacts:
name: ${CI_PROJECT_NAME}-${CI_JOB_NAME}-${CI_PIPELINE_IID}
paths:
Expand Down Expand Up @@ -357,6 +345,7 @@ deploy_for_other_project:
artifacts: true

integration-test:
image: $DOCKER_URL/node:16
tags:
- do-test-docker-executor
rules:
Expand Down
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# Changelog
Changes to this project are documented in this file. More detail and links can be found in the Declarative Onboarding [Document Revision History](https://clouddocs.f5.com/products/extensions/f5-declarative-onboarding/latest/revision-history.html).

## 1.41.0
### Added
- AUTOTOOL-4020: ([GitHub 86](https://github.com/F5Networks/f5-declarative-onboarding/issues/86)): Update trust certificates when updating device certificate

### Fixed
- AUTOTOOL-3907: Reports error with Radius server

### Changed

### Removed

## 1.40.0
### Added
- AUTOTOOL-3931: ([GitHub Issue 656](https://github.com/F5Networks/f5-appsvcs-extension/issues/656)): Add WAF Settings configuration support on DO
Expand All @@ -14,6 +25,16 @@ Changes to this project are documented in this file. More detail and links can b

### Removed

## 1.39.1
### Added

### Fixed

### Changed
- Promoted to LTS

### Removed

## 1.39.0
### Added

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ Be sure to see the [Support page](SUPPORT.md) in this repo for more details and

## Copyright

Copyright 2014-2023 F5 Networks Inc.
Copyright 2014-2023 F5, Inc.

### F5 Networks Contributor License Agreement

Before you start contributing to any project sponsored by F5 Networks, Inc. (F5) on GitHub, you will need to sign a Contributor License Agreement (CLA).
Before you start contributing to any project sponsored by F5, Inc. on GitHub, you will need to sign a Contributor License Agreement (CLA).

If you are signing as an individual, we recommend that you talk to your employer (if applicable) before signing the CLA since some employment agreements may have restrictions on your contributions to other projects. Otherwise by submitting a CLA you represent that you are legally entitled to grant the licenses recited therein.

Expand Down
21 changes: 12 additions & 9 deletions docs/declarations/network-objects.rst
Original file line number Diff line number Diff line change
Expand Up @@ -174,17 +174,19 @@ This example shows how you can create network routing prefix lists using BIG-IP

See |prefix| and |prefixentry| in the Schema Reference for BIG-IP DO usage and options.

**New in BIG-IP DO 1.23** |br|
BIG-IP DO 1.23 introduced the ability to use strings for the **prefixLengthRange** range property. Previous versions would only accept integers. |br|
**Important** If you try to use the following example on versions prior to 1.23, it will fail. If using a previous version, replace the values in the highlighted lines with integers.

**New in BIG-IP DO 1.40** |br|
BIG-IP DO 1.40 introduced the ability to define a route domain and assign it to a routing prefix list using the new **routeDomain** property in the |prefix| class.

The following example contains multiple prefix lists, but no other BIG-IP DO configuration. You can use this class as a part of a larger BIG-IP Declarative Onboarding declaration.

The following example contains multiple prefix lists, but no other BIG-IP DO configuration. You can use this class as a part of a larger BIG-IP Declarative Onboarding declaration.

.. IMPORTANT:: If you try to use the following example with a version prior to 1.40, it will fail. For previous versions, remove the lines in yellow, and the commas from lines 43 and 61.

.. literalinclude:: ../../examples/routingPrefixList.json
:language: json
:emphasize-lines: 15, 21, 32, 38
:emphasize-lines: 8-27, 44, 62

:ref:`Back to top<networkexamples>`

Expand Down Expand Up @@ -215,18 +217,19 @@ The BGP routing configuration uses the following BIG-IP Declarative Onboarding c

The **RoutingBGP** class contains a number of properties used in the following example, so be sure to see |routingbgp| for descriptions and options.

**New in BIG-IP DO 1.24** |br|
BIG-IP Declarative Onboarding 1.24 introduced the **ebgpMultihop** property for BGP neighbors. This property allows you to specify between 1 and 255 external BGP members that are not on directly connected networks (the default is **1**). See |ebgp| in the Schema Reference for more information.

**New in BIG-IP DO 1.28** |br|
BIG-IP Declarative Onboarding 1.28 adds support for specifying route domains in |routingbgp| and |routemap|.
BIG-IP Declarative Onboarding 1.28 added support for specifying route domains in |routingbgp| and |routemap|.

**New in BIG-IP DO 1.40** |br|
As noted in the previous example, BIG-IP DO 1.40 introduced the ability to define a route domain and assign it to a routing prefix list using the new **routeDomain** property in the |prefix| class.

.. IMPORTANT:: If you try to use the following example with a version prior to 1.28, it will fail. For previous versions, remove the lines in yellow. You can leave the **ebgpMultihop** lines if using a BIG-IP DO version between 1.24 and 1.27.
.. IMPORTANT:: If you try to use the following example with a version prior to 1.40, it will fail. For previous versions, remove the lines in yellow, and the commas from lines 56 and 68.


.. literalinclude:: ../../examples/bgp.json
:language: json
:emphasize-lines: 85, 103, 133, 138, 158
:emphasize-lines: 57, 69

|
Expand Down
6 changes: 5 additions & 1 deletion docs/revision-history.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,11 @@ Document Revision History
- Date

* - 1.40
- Updated the documentation for Declarative Onboarding v1.40.0. This release contains the following changes: |br| * Added support for configuring BIG-IP ASM options in a declaration (see :ref:`AS3 options <asmdo>`), `GitHub Issue 656 <https://github.com/F5Networks/f5-appsvcs-extension/issues/656>`_ |br| * Support for configuring username and password prompts (see :ref:`Configuring username and password prompts<unpw>`) |br| |br| Issues Resolved: |br| * Fix documentation output in the Schema Reference for the |system|.
- Updated the documentation for Declarative Onboarding v1.40.0. This release contains the following changes: |br| * Added support for configuring BIG-IP ASM options in a declaration (see :ref:`AS3 options <asmdo>`), `GitHub Issue 656 <https://github.com/F5Networks/f5-appsvcs-extension/issues/656>`_ |br| * Support for configuring username and password prompts (see :ref:`Configuring username and password prompts<unpw>`) |br| * Added support for the route-domain attribute in Routing Prefix lists (see the updated :ref:`Routing Prefix List example <example26>`) |br| |br| Issues Resolved: |br| * Fix documentation output in the Schema Reference for the |system|.
- 9-12-23

* - 1.39.1
- Released BIG-IP Declarative Onboarding 1.39.1 as a LTS (Long Term Support) version. See the BIG-IP Declarative Onboarding |supportmd| for information about the BIG-IP Declarative Onboarding support policy.
- 9-12-23

* - 1.39
Expand Down
18 changes: 18 additions & 0 deletions examples/deviceCertificateAndTrustCertificates.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"schemaVersion": "1.41.0",
"class": "Device",
"Common": {
"class": "Tenant",
"hostname": "bigip.example.com",
"deviceCertificate": {
"class": "DeviceCertificate",
"certificate": {
"base64": "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCkY1IEZBS0UgQ0VSVElGSUNBVEUKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ=="
},
"privateKey": {
"base64": "LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpGNSBGQUtFIFBSSVZBVEUgS0VZCi0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0t"
},
"updateTrustCerts": true
}
}
}
Loading

0 comments on commit 3adbce8

Please sign in to comment.