Skip to content

Commit f3b4194

Browse files
jvallexmjvallexm
committed
Merge remote-tracking branch 'internal/main'
2 parents 0b38bf6 + 39330e1 commit f3b4194

36 files changed

+1162
-192
lines changed

‎.docs/powervs-poc.md

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ The VPC VPN Server used for client to site VPNs requires SSL/TLS certificates st
120120

121121
1. Create a Secrets Manager instance and either [order public certificates](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-public-certificates&interface=ui
122122
), [create private certificates](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-private-certificates&interface=ui
123-
), or [import certificates](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-certificates&interface=ui).
123+
), or [import certificates](https://cloud.ibm.com/docs/secrets-manager?topic=secrets-manager-certificates&interface=ui). Consult the [VPC client-to-site server authentication documentation](https://cloud.ibm.com/docs/vpc?topic=vpc-client-to-site-authentication) to ensure the certificate authorities and certificates are created using values that are compatible with the VPN server.
124124
2. Choose VPC Deployments from the menu and create a new security group for the VPN Server.
125125
Create the security group in the `transit-rg` resource group.
126126
Add the following rules to the group:
@@ -140,7 +140,7 @@ Set the VPN Server values using the following table as a guide.
140140
| VPC | transit |
141141
| Subnets | vpn-zone-1 |
142142
| Security group | security group created in step 3 |
143-
| Authentication method | Certificate |
143+
| Authentication method | Username and Certificate |
144144
| Certificate CRN | The CRN of the Secrets Manager secret containing the certificate for the VPN Server. |
145145
| Client CA CRN | The CRN of the Secrets Manager secret containing the certificate for the VPN client. |
146146
| Client CIDR Pool | Specify a network CIDR that does not conflict with any on-premises network, the VPC network, or the Power VS network. The CIDR should also be a subnet of 10.0.0.0/8 to avoid additional security group changes. |
@@ -199,3 +199,20 @@ Here are the list of fields and values to be used to setup on-prem VPN gateway:
199199
* Preshared Key: Shared between both VPNs to establish connection.
200200
* Peer CIDR: IBM VPC CIDRs + IBM PowerVS CIDRs to allow communication into IBM cloud environment via VPN.
201201
* IKE policy: IKEv2
202+
203+
### Configuring VPC VPN Server - Client to Site VPN users
204+
205+
If a VPC VPN Server was added to the configuration as documented with the `Username and Certificate` authentication mechanism, VPN users must have the correct access policies to log into the VPN.
206+
207+
The following steps can be used to create an access group with the appropriate access policy and add VPN users:
208+
209+
Create Access Group:
210+
- Manage -> Access (IAM) -> Access Groups -> Create +
211+
- Name the access group _(i.e. VPN Users)_
212+
- Add users and/or service IDs as needed
213+
- Navigate to Access tab -> Assign access +
214+
- Create an access policy with the following:
215+
216+
| Service | Resources | Access |
217+
|- |- |- |
218+
| VPC Infrastructure Service | All | Users of the VPN server need this role to connect to the VPN server |

‎CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,27 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## 1.15.6
6+
7+
### Upgrade Notes
8+
9+
- Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan
10+
- Updated AIX stock images and removed deprecated images for all templates with invalid image references
11+
12+
### Features
13+
14+
- When creating a VPN Server, users can now have both certificate and username authentication by selecting the `Username and Certificate` authentication method
15+
16+
### Fixes
17+
18+
- Fixed an issue causing Resource Groups assigned to Security Groups to not be correctly imported into VPC modules
19+
- Fixed an issue preventing users from downloading Terraform code when using only existing VPCs and VPC Subnets
20+
- Fixed an issue in the Power VS POC template where the LogDNA files were written to the AIX save files COS bucket
21+
- Fixed an issue causing Cloud Services with missing values not to be highlighed red on the `/v2/services` page
22+
- The Power VS POC Template Activity Tracker COS instance now correctly uses a random suffix to ensure unique resource naming
23+
- Fixed an issue causing imported VPC Security Groups to fail on Terraform Plan
24+
- Power VS Images are now reset when changing zones or changing the name of an existing workspace
25+
526
## 1.15.5
627

728
### Fixes

‎client/package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "craig",
3-
"version": "1.15.5",
3+
"version": "1.15.6",
44
"private": true,
55
"license": "Apache-2.0",
66
"scripts": {

‎client/src/components/forms/dynamic-form/DynamicFetchMultiSelect.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ class DynamicFetchMultiSelect extends React.Component {
4343
this._isMounted = false;
4444
}
4545

46-
// Force re-fetch of images on zone change
46+
// Force re-fetch of images on name or zone change
4747
componentDidUpdate(prevProps) {
48-
if (prevProps.parentState.zone != this.props.parentState.zone) {
48+
if (
49+
prevProps.parentState.zone != this.props.parentState.zone ||
50+
prevProps.parentState.name != this.props.parentState.name
51+
) {
4952
this._isMounted = false;
5053
this.setState({ data: ["Loading..."] }, () => {
5154
this.componentDidMount();

‎client/src/components/pages/cloud-services/CloudServices.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,7 +587,9 @@ class CloudServicesPage extends React.Component {
587587
service={{
588588
type: "atracker",
589589
name: "atracker",
590+
data: craig.store.json.atracker,
590591
}}
592+
craig={craig}
591593
onClick={this.onServiceIconClick}
592594
isSelected={this.state.service === "atracker"}
593595
/>
@@ -688,6 +690,7 @@ class CloudServicesPage extends React.Component {
688690
resourceGroup={rg}
689691
service={service}
690692
icon={serviceFormMap[service.type].icon}
693+
craig={craig}
691694
onClick={this.onServiceIconClick}
692695
isSelected={
693696
this.state.service === service.type &&

‎client/src/components/pages/diagrams/ManageService.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { contains, titleCase } from "lazy-z";
22
import React from "react";
33
import PropTypes from "prop-types";
44
import { RenderForm } from "../../forms";
5+
import { disableSave } from "../../../lib";
56

67
export const ManageService = (props) => {
78
return (
@@ -10,7 +11,14 @@ export const ManageService = (props) => {
1011
"manageService alignButtons" +
1112
(props.isSelected
1213
? " serviceOpen"
13-
: props.resourceGroup === "No Resource Group"
14+
: disableSave(
15+
props.service.overrideType || props.service.type,
16+
props.service.data,
17+
{
18+
data: props.service.data,
19+
craig: props.craig,
20+
}
21+
)
1422
? " noRgService"
1523
: "") +
1624
" " +

‎client/src/components/pages/diagrams/RgServiceMap.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ export const RgServiceMap = (props) => {
110110
icon={serviceFormMap[service.type].icon}
111111
className="pointerEventsNone"
112112
small={props.small}
113+
craig={props.craig}
113114
/>
114115
);
115116
})

‎client/src/lib/docs/release-notes.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,23 @@
11
[
2+
{
3+
"version": "1.15.6",
4+
"features": [
5+
"When creating a VPN Server, users can now have both certificate and username authentication by selecting the `Username and Certificate` authentication method"
6+
],
7+
"fixes": [
8+
"Fixed an issue causing Resource Groups assigned to Security Groups to not be correctly imported into VPC modules",
9+
"Fixed an issue preventing users from downloading Terraform code when using only existing VPCs and VPC Subnets",
10+
"Fixed an issue in the Power VS POC template where the LogDNA files were written to the AIX save files COS bucket",
11+
"Fixed an issue causing Cloud Services with missing values not to be highlighed red on the `/v2/services` page",
12+
"The Power VS POC Template Activity Tracker COS instance now correctly uses a random suffix to ensure unique resource naming",
13+
"Fixed an issue causing imported VPC Security Groups to fail on Terraform Plan",
14+
"Power VS Images are now reset when changing zones or changing the name of an existing workspace"
15+
],
16+
"upgrade_notes": [
17+
"Updated the VPN as a Service template's default authentication method and changed the Secrets Manager to the Trial plan",
18+
"Updated AIX stock images and removed deprecated images for all templates with invalid image references"
19+
]
20+
},
221
{
322
"version": "1.15.5",
423
"features": [],

0 commit comments

Comments
 (0)