remove etcdencryption and etcdencryptionsetid from the project. Will …

…implement in the future
Azure · Feb 24, 2025 · 59ce0ca · 59ce0ca
1 parent ae6684d
commit 59ce0ca
Show file tree

Hide file tree

Showing 19 changed files with 18 additions and 90 deletions.
diff --git a/...ement/examples/2024-06-10-preview/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json b/...ement/examples/2024-06-10-preview/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json
@@ -26,7 +26,6 @@
           "api": {
             "visibility": "public"
           },
-          "etcdEncryption": true,
           "disableUserWorkloadMonitoring": true,
           "proxy": {
             "httpProxy": "sjjbjvkimlvtwdnwjodcajidcoompt",
@@ -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
@@ -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": {
@@ -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": {

diff --git a/...uster.Management/examples/2024-06-10-preview/HcpOpenShiftClusters_Get_MaximumSet_Gen.json b/...uster.Management/examples/2024-06-10-preview/HcpOpenShiftClusters_Get_MaximumSet_Gen.json
@@ -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": {

diff --git a/.../examples/2024-06-10-preview/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json b/.../examples/2024-06-10-preview/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json
@@ -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": {

diff --git a/...t/examples/2024-06-10-preview/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json b/...t/examples/2024-06-10-preview/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json
@@ -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": {

diff --git a/...er.Management/examples/2024-06-10-preview/HcpOpenShiftClusters_Update_MaximumSet_Gen.json b/...er.Management/examples/2024-06-10-preview/HcpOpenShiftClusters_Update_MaximumSet_Gen.json
@@ -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": {

diff --git a/api/redhatopenshift/HcpCluster.Management/hcpCluster-models.tsp b/api/redhatopenshift/HcpCluster.Management/hcpCluster-models.tsp
@@ -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;
@@ -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;
 }

diff --git a/...eview/2024-06-10-preview/examples/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json b/...eview/2024-06-10-preview/examples/HcpOpenShiftClusters_CreateOrUpdate_MaximumSet_Gen.json
@@ -26,7 +26,6 @@
           "api": {
             "visibility": "public"
           },
-          "etcdEncryption": true,
           "disableUserWorkloadMonitoring": true,
           "proxy": {
             "httpProxy": "sjjbjvkimlvtwdnwjodcajidcoompt",
@@ -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
@@ -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": {
@@ -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": {

diff --git a/...clusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Get_MaximumSet_Gen.json b/...clusters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Get_MaximumSet_Gen.json
@@ -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": {

diff --git a/.../2024-06-10-preview/examples/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json b/.../2024-06-10-preview/examples/HcpOpenShiftClusters_ListByResourceGroup_MaximumSet_Gen.json
@@ -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": {

diff --git a/...w/2024-06-10-preview/examples/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json b/...w/2024-06-10-preview/examples/HcpOpenShiftClusters_ListBySubscription_MaximumSet_Gen.json
@@ -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": {

diff --git a/...sters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Update_MaximumSet_Gen.json b/...sters/preview/2024-06-10-preview/examples/HcpOpenShiftClusters_Update_MaximumSet_Gen.json
@@ -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": {

diff --git a/...rce-manager/Microsoft.RedHatOpenShift/hcpclusters/preview/2024-06-10-preview/openapi.json b/...rce-manager/Microsoft.RedHatOpenShift/hcpclusters/preview/2024-06-10-preview/openapi.json
@@ -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",
@@ -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"

diff --git a/frontend/pkg/frontend/ocm.go b/frontend/pkg/frontend/ocm.go
@@ -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(),
@@ -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{
@@ -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.
@@ -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)).

diff --git a/frontend/utils/create.go b/frontend/utils/create.go
@@ -62,7 +62,6 @@ func CreateJSONFile() error {
 			API: api.APIProfile{
 				Visibility: api.Visibility("public"),
 			},
-			EtcdEncryption:                false,
 			DisableUserWorkloadMonitoring: false,
 			Proxy:                         api.ProxyProfile{},
 			Platform: api.PlatformProfile{