Skip to content

Commit ac0d992

Browse files
paigecalvertpaigecalvert
committed
merge conflicts
2 parents ef8bf43 + 222524b commit ac0d992

File tree

146 files changed

+3008
-1758
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

146 files changed

+3008
-1758
lines changed

‎.github/workflows/app-manager-release-notes.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
owner-repo: replicatedhq/kots
2323
head: $KOTS_VERSION
2424
title: ${KOTS_VERSION#v}
25-
description: 'Support for Kubernetes: 1.31, 1.32, and 1.33'
25+
description: 'Support for Kubernetes: 1.31, 1.32, 1.33, and 1.34'
2626
include-pr-links: false
2727
github-token: ${{ secrets.GITHUB_TOKEN }}
2828

‎docs/intro.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ hide_table_of_contents: true
1313
<p>What's New?</p>
1414
</li>
1515
<li>
16-
<h3>Announcing: Beta Support for Compatibility Matrix VMs</h3>
17-
<p>You can now use Compatibility Matrix to create VMs, making it easier to spin up environments for testing installation methods that require direct OS access, like Embedded Cluster.</p>
16+
<h3>Announcing: Security Center (Alpha)</h3>
17+
<p>The Security Center (Alpha) makes it easier for vendors and their enterprise customers to monitor security risks, assess known vulnerabilities, and view security information for each release.</p>
1818
</li>
1919
<li>
20-
<a href="/vendor/testing-vm-create">Learn more</a>
20+
<a href="/vendor/security-center-about">Learn more</a>
2121
</li>
2222
</ul>
2323
<ul id="did-you-know">
@@ -26,11 +26,11 @@ hide_table_of_contents: true
2626
<p>Did You Know?</p>
2727
</li>
2828
<li>
29-
<h3>Add Allowed Domains for Enterprise Portal Invitations</h3>
30-
<p>When this option is enabled, only users with allowed email domains can be invited to a customer's Enterprise Portal.</p>
29+
<h3>Simulate Air Gap Networks With CMX</h3>
30+
<p>Set the network policy of VMs or VM-based clusters to `airgap` to simulate an environment with no outbound internet access.</p>
3131
</li>
3232
<li>
33-
<a href="/vendor/enterprise-portal-invite#configure-allowed-domains-for-user-invitations">Learn more</a>
33+
<a href="/vendor/testing-network-policy">Learn more</a>
3434
</li>
3535
</ul>
3636
</section>

‎docs/partials/install/_kubernetes-compatibility.mdx‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
| KOTS Versions | Kubernetes Compatibility |
22
|------------------------|-----------------------------|
3-
| 1.124.17 and later | 1.33, 1.32, 1.31 |
4-
| 1.123.0 and later | 1.32, 1.31 |
3+
| 1.128.3 and later | 1.34, 1.33, 1.32, 1.31 |
4+
| 1.124.17 to 1.128.3 | 1.33, 1.32, 1.31 |
5+
| 1.123.0 to 1.124.16 | 1.32, 1.31 |
56
| 1.117.0 to 1.122.1 | 1.31 |

‎docs/partials/replicated-sdk/_dependency-yaml.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
dependencies:
44
- name: replicated
55
repository: oci://registry.replicated.com/library
6-
version: 1.9.0
6+
version: 1.11.0
77
```
88
99
For the latest version information for the Replicated SDK, see the [replicated-sdk repository](https://github.com/replicatedhq/replicated-sdk/releases) in GitHub.

‎docs/reference/replicated-cli-api-get.mdx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@ replicated api get /v3/apps
3030
### Options inherited from parent commands
3131

3232
```
33-
--app string The app slug or app id to use in all calls
34-
--debug Enable debug output
35-
--token string The API token to use to access your app in the Vendor API
33+
--app string The app slug or app id to use in all calls
34+
--debug Enable debug output
35+
--profile string The authentication profile to use for this command
36+
--token string The API token to use to access your app in the Vendor API
3637
```
3738

3839
### SEE ALSO

‎docs/reference/replicated-cli-api-patch.mdx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ replicated api patch /v3/customer/2VffY549paATVfHSGpJhjh6Ehpy -b '{"name":"Valua
3131
### Options inherited from parent commands
3232

3333
```
34-
--app string The app slug or app id to use in all calls
35-
--debug Enable debug output
36-
--token string The API token to use to access your app in the Vendor API
34+
--app string The app slug or app id to use in all calls
35+
--debug Enable debug output
36+
--profile string The authentication profile to use for this command
37+
--token string The API token to use to access your app in the Vendor API
3738
```
3839

3940
### SEE ALSO

‎docs/reference/replicated-cli-api-post.mdx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ replicated api post /v3/app/2EuFxKLDxKjPNk2jxMTmF6Vxvxu/channel -b '{"name":"mar
3131
### Options inherited from parent commands
3232

3333
```
34-
--app string The app slug or app id to use in all calls
35-
--debug Enable debug output
36-
--token string The API token to use to access your app in the Vendor API
34+
--app string The app slug or app id to use in all calls
35+
--debug Enable debug output
36+
--profile string The authentication profile to use for this command
37+
--token string The API token to use to access your app in the Vendor API
3738
```
3839

3940
### SEE ALSO

‎docs/reference/replicated-cli-api-put.mdx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ replicated api put /v3/app/2EuFxKLDxKjPNk2jxMTmF6Vxvxu/channel/2QLPm10JPkta7jO3Z
3131
### Options inherited from parent commands
3232

3333
```
34-
--app string The app slug or app id to use in all calls
35-
--debug Enable debug output
36-
--token string The API token to use to access your app in the Vendor API
34+
--app string The app slug or app id to use in all calls
35+
--debug Enable debug output
36+
--profile string The authentication profile to use for this command
37+
--token string The API token to use to access your app in the Vendor API
3738
```
3839

3940
### SEE ALSO

‎docs/reference/replicated-cli-api.mdx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,10 @@ Make ad-hoc API calls to the Replicated API
1111
### Options inherited from parent commands
1212

1313
```
14-
--app string The app slug or app id to use in all calls
15-
--debug Enable debug output
16-
--token string The API token to use to access your app in the Vendor API
14+
--app string The app slug or app id to use in all calls
15+
--debug Enable debug output
16+
--profile string The authentication profile to use for this command
17+
--token string The API token to use to access your app in the Vendor API
1718
```
1819

1920
### SEE ALSO

‎docs/reference/replicated-cli-app-create.mdx‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,10 @@ replicated app create "Custom App" --output table
3939
### Options inherited from parent commands
4040

4141
```
42-
--app string The app slug or app id to use in all calls
43-
--debug Enable debug output
44-
--token string The API token to use to access your app in the Vendor API
42+
--app string The app slug or app id to use in all calls
43+
--debug Enable debug output
44+
--profile string The authentication profile to use for this command
45+
--token string The API token to use to access your app in the Vendor API
4546
```
4647

4748
### SEE ALSO

0 commit comments

Comments
 (0)