rename state.publicIP to cluster endpoint

edgelesssys · Sep 25, 2023 · e603c2e · e603c2e
1 parent e174016
commit e603c2e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/cli/internal/cloudcmd/create_test.go b/cli/internal/cloudcmd/create_test.go
@@ -237,7 +237,7 @@ func TestCreator(t *testing.T) {
 				}
 			} else {
 				assert.NoError(err)
-				assert.Equal(ip, idFile.PublicIP)
+				assert.Equal(ip, idFile.ClusterEndpoint)
 			}
 		})
 	}

diff --git a/cli/internal/cmd/create.go b/cli/internal/cmd/create.go
@@ -189,7 +189,7 @@ func (c *createCmd) create(cmd *cobra.Command, creator cloudCreator, fileHandler
 func convertToIDFile(infra state.Infrastructure, provider cloudprovider.Provider) clusterid.File {
 	var file clusterid.File
 	file.CloudProvider = provider
-	file.IP = infra.PublicIP
+	file.IP = infra.ClusterEndpoint
 	file.APIServerCertSANs = infra.APIServerCertSANs
 	file.InitSecret = []byte(infra.InitSecret) // Convert string to []byte
 	file.UID = infra.UID

diff --git a/cli/internal/cmd/create_test.go b/cli/internal/cmd/create_test.go
@@ -31,7 +31,7 @@ func TestCreate(t *testing.T) {
 		require.NoError(file.WriteYAML(constants.ConfigFilename, defaultConfigWithExpectedMeasurements(t, config.Default(), provider)))
 		return fs
 	}
-	infraState := state.Infrastructure{PublicIP: "192.0.2.1"}
+	infraState := state.Infrastructure{ClusterEndpoint: "192.0.2.1"}
 	someErr := errors.New("failed")
 
 	testCases := map[string]struct {
@@ -157,13 +157,13 @@ func TestCreate(t *testing.T) {
 					var gotIDFile clusterid.File
 					require.NoError(fileHandler.ReadJSON(constants.ClusterIDsFilename, &gotIDFile))
 					assert.Equal(gotIDFile, clusterid.File{
-						IP:            infraState.PublicIP,
+						IP:            infraState.ClusterEndpoint,
 						CloudProvider: tc.provider,
 					})
 
 					var gotState state.State
 					expectedState := state.Infrastructure{
-						PublicIP:          "192.0.2.1",
+						ClusterEndpoint:   "192.0.2.1",
 						APIServerCertSANs: []string{},
 					}
 					require.NoError(fileHandler.ReadYAML(constants.StateFilename, &gotState))

diff --git a/cli/internal/helm/overrides.go b/cli/internal/helm/overrides.go
@@ -42,7 +42,7 @@ func extraCiliumValues(provider cloudprovider.Provider, conformanceMode bool, ou
 		}
 	}
 
-	extraVals["k8sServiceHost"] = output.PublicIP
+	extraVals["k8sServiceHost"] = output.ClusterEndpoint
 	extraVals["k8sServicePort"] = constants.KubernetesPort
 	if provider == cloudprovider.GCP {
 		extraVals["ipv4NativeRoutingCIDR"] = output.GCP.IPCidrPod
@@ -62,10 +62,10 @@ func extraConstellationServicesValues(
 	}
 	extraVals["verification-service"] = map[string]any{
 		"attestationVariant": cfg.GetAttestationConfig().GetVariant().String(),
-		"loadBalancerIP":     output.PublicIP,
+		"loadBalancerIP":     output.ClusterEndpoint,
 	}
 	extraVals["konnectivity"] = map[string]any{
-		"loadBalancerIP": output.PublicIP,
+		"loadBalancerIP": output.ClusterEndpoint,
 	}
 
 	extraVals["key-service"] = map[string]any{

diff --git a/cli/internal/state/state.go b/cli/internal/state/state.go
@@ -29,7 +29,7 @@ func NewState(Infrastructure Infrastructure) State {
 // Infrastructure describe the state related to the cloud resources of the cluster.
 type Infrastructure struct {
 	UID               string   `yaml:"uid"`
-	PublicIP          string   `yaml:"publicIP"`
+	ClusterEndpoint   string   `yaml:"clusterEndpoint"`
 	InitSecret        string   `yaml:"initSecret"`
 	APIServerCertSANs []string `yaml:"apiServerCertSANs"`
 	Azure             *Azure   `yaml:"azure"`

diff --git a/cli/internal/terraform/terraform.go b/cli/internal/terraform/terraform.go
@@ -184,7 +184,7 @@ func (c *Client) ShowInfrastructure(ctx context.Context, provider cloudprovider.
 func ConvertToInfrastructure(applyOutput ApplyOutput) state.Infrastructure {
 	var infra state.Infrastructure
 	infra.UID = applyOutput.UID
-	infra.PublicIP = applyOutput.IP
+	infra.ClusterEndpoint = applyOutput.IP
 	infra.InitSecret = applyOutput.Secret
 	infra.APIServerCertSANs = applyOutput.APIServerCertSANs