Skip to content

Commit

Permalink
remove etcdencryption and etcdencryptionsetid from the project. Will …
Browse files Browse the repository at this point in the history
…implement in the future
  • Loading branch information
Jonathan Chang committed Feb 26, 2025
1 parent 8c07c4c commit 484eaa3
Show file tree
Hide file tree
Showing 18 changed files with 15 additions and 86 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"api": {
"visibility": "public"
},
"etcdEncryption": true,
"disableUserWorkloadMonitoring": true,
"proxy": {
"httpProxy": "sjjbjvkimlvtwdnwjodcajidcoompt",
Expand All @@ -38,8 +37,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"externalAuth": {
"enabled": true
Expand Down Expand Up @@ -96,8 +94,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "https://oidc.contoso.com",
"externalAuth": {
Expand Down Expand Up @@ -215,8 +212,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "https://oidc.contoso.com",
"externalAuth": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "pqfgpubcuaaovvpeqal",
"externalAuth": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "pqfgpubcuaaovvpeqal",
"externalAuth": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "pqfgpubcuaaovvpeqal",
"externalAuth": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "pqfgpubcuaaovvpeqal",
"externalAuth": {
Expand Down
12 changes: 0 additions & 12 deletions api/redhatopenshift/HcpCluster.Management/hcpCluster-models.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -77,12 +77,6 @@ model HcpOpenShiftClusterProperties {
@visibility("read")
api: ApiProfile;

/** Enables customer ETCD encryption, set during creation
* When set to true, `platform.etcdEncryptionSetId` must be set
*/
@visibility("create", "read")
etcdEncryption?: boolean = false;

/** Disable user workload monitoring */
@visibility("create", "update")
disableUserWorkloadMonitoring?: boolean = false;
Expand Down Expand Up @@ -300,12 +294,6 @@ model PlatformProfile {
/** ResourceId for the network security group attached to the cluster subnet */
networkSecurityGroupId?: NetworkSecurityGroupResourceId;

/** The id of the disk encryption set to be used for etcd.
* Configure this when `etcdEncryption` is set to true
* Is used the https://learn.microsoft.com/en-us/azure/storage/common/customer-managed-keys-overview
*/
etcdEncryptionSetId?: string;

/** The configuration that the operators of the cluster have to authenticate to Azure */
operatorsAuthentication: OperatorsAuthenticationProfile;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"api": {
"visibility": "public"
},
"etcdEncryption": true,
"disableUserWorkloadMonitoring": true,
"proxy": {
"httpProxy": "sjjbjvkimlvtwdnwjodcajidcoompt",
Expand All @@ -38,8 +37,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"externalAuth": {
"enabled": true
Expand Down Expand Up @@ -96,8 +94,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "https://oidc.contoso.com",
"externalAuth": {
Expand Down Expand Up @@ -215,8 +212,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "https://oidc.contoso.com",
"externalAuth": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "pqfgpubcuaaovvpeqal",
"externalAuth": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "pqfgpubcuaaovvpeqal",
"externalAuth": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "pqfgpubcuaaovvpeqal",
"externalAuth": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,7 @@
"managedResourceGroup": "nhyhywrxupo",
"subnetId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/virtualNetworks/hcp-network-example/subnets/example-subnet",
"outboundType": "loadBalancer",
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example",
"etcdEncryptionSetId": "mrhumnvbsnnzduuhw"
"networkSecurityGroupId": "/subscriptions/FDEA43EA-0230-4A7D-BDEE-F3AFF2183B1D/resourceGroups/resourceGroupName/providers/Microsoft.Network/networkSecurityGroups/nsg-example"
},
"issuerUrl": "pqfgpubcuaaovvpeqal",
"externalAuth": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1382,15 +1382,6 @@
"description": "Shows the cluster API server profile",
"readOnly": true
},
"etcdEncryption": {
"type": "boolean",
"description": "Enables customer ETCD encryption, set during creation\nWhen set to true, `platform.etcdEncryptionSetId` must be set",
"default": false,
"x-ms-mutability": [
"read",
"create"
]
},
"disableUserWorkloadMonitoring": {
"type": "boolean",
"description": "Disable user workload monitoring",
Expand Down Expand Up @@ -1913,10 +1904,6 @@
"$ref": "#/definitions/NetworkSecurityGroupResourceId",
"description": "ResourceId for the network security group attached to the cluster subnet"
},
"etcdEncryptionSetId": {
"type": "string",
"description": "The id of the disk encryption set to be used for etcd.\nConfigure this when `etcdEncryption` is set to true\nIs used the https://learn.microsoft.com/en-us/azure/storage/common/customer-managed-keys-overview"
},
"operatorsAuthentication": {
"$ref": "#/definitions/OperatorsAuthenticationProfile",
"description": "The configuration that the operators of the cluster have to authenticate to Azure"
Expand Down
6 changes: 1 addition & 5 deletions frontend/pkg/frontend/ocm.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ func ConvertCStoHCPOpenShiftCluster(resourceID *azcorearm.ResourceID, cluster *a
URL: cluster.API().URL(),
Visibility: convertListeningToVisibility(cluster.API().Listening()),
},
EtcdEncryption: cluster.EtcdEncryption(),
DisableUserWorkloadMonitoring: cluster.DisableUserWorkloadMonitoring(),
Proxy: api.ProxyProfile{
HTTPProxy: cluster.Proxy().HTTPProxy(),
Expand All @@ -116,7 +115,6 @@ func ConvertCStoHCPOpenShiftCluster(resourceID *azcorearm.ResourceID, cluster *a
SubnetID: cluster.Azure().SubnetResourceID(),
OutboundType: convertOutboundTypeCSToRP(cluster.Azure().NodesOutboundConnectivity().OutboundType()),
NetworkSecurityGroupID: cluster.Azure().NetworkSecurityGroupResourceID(),
EtcdEncryptionSetID: "",
},
IssuerURL: "",
ExternalAuth: api.ExternalAuthConfigProfile{
Expand Down Expand Up @@ -186,7 +184,6 @@ func (f *Frontend) BuildCSCluster(resourceID *azcorearm.ResourceID, requestHeade
clusterBuilder := arohcpv1alpha1.NewCluster()

// FIXME HcpOpenShiftCluster attributes not being passed:
// PlatformProfile.EtcdEncryptionSetID (no CS equivalent?)
// ExternalAuth (TODO, complicated)

// These attributes cannot be updated after cluster creation.
Expand Down Expand Up @@ -215,8 +212,7 @@ func (f *Frontend) BuildCSCluster(resourceID *azcorearm.ResourceID, requestHeade
MachineCIDR(hcpCluster.Properties.Network.MachineCIDR).
HostPrefix(int(hcpCluster.Properties.Network.HostPrefix))).
API(arohcpv1alpha1.NewClusterAPI().
Listening(convertVisibilityToListening(hcpCluster.Properties.API.Visibility))).
EtcdEncryption(hcpCluster.Properties.EtcdEncryption)
Listening(convertVisibilityToListening(hcpCluster.Properties.API.Visibility)))

azureBuilder := arohcpv1alpha1.NewAzure().
TenantID(requestHeader.Get(arm.HeaderNameHomeTenantID)).
Expand Down
1 change: 0 additions & 1 deletion frontend/utils/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ func CreateJSONFile() error {
API: api.APIProfile{
Visibility: api.Visibility("public"),
},
EtcdEncryption: false,
DisableUserWorkloadMonitoring: false,
Proxy: api.ProxyProfile{},
Platform: api.PlatformProfile{
Expand Down
2 changes: 0 additions & 2 deletions internal/api/hcpopenshiftcluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ type HCPOpenShiftClusterProperties struct {
Network NetworkProfile `json:"network,omitempty" visibility:"read create"`
Console ConsoleProfile `json:"console,omitempty" visibility:"read"`
API APIProfile `json:"api,omitempty" visibility:"read create"`
EtcdEncryption bool `json:"etcdEncryption,omitempty" visibility:"read create"`
DisableUserWorkloadMonitoring bool `json:"disableUserWorkloadMonitoring,omitempty" visibility:"read create update"`
Proxy ProxyProfile `json:"proxy,omitempty" visibility:"read create update"`
Platform PlatformProfile `json:"platform,omitempty" visibility:"read create"`
Expand Down Expand Up @@ -83,7 +82,6 @@ type PlatformProfile struct {
SubnetID string `json:"subnetId,omitempty" validate:"required_for_put"`
OutboundType OutboundType `json:"outboundType,omitempty" validate:"omitempty,enum_outboundtype"`
NetworkSecurityGroupID string `json:"networkSecurityGroupId,omitempty"`
EtcdEncryptionSetID string `json:"etcdEncryptionSetId,omitempty"`
OperatorsAuthentication OperatorsAuthenticationProfile `json:"operatorsAuthentication,omitempty"`
}

Expand Down
7 changes: 0 additions & 7 deletions internal/api/v20240610preview/generated/models.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 484eaa3

Please sign in to comment.