fix: implement review feedback for configurable ports

Signed-off-by: Jared Watts <[email protected]>

Author: jbw976

cmd/crossplane/core/core.go

@@ -103,11 +103,11 @@ type startCommand struct {
 	MaxReconcileRate                 int           `default:"100" help:"The global maximum rate per second at which resources may checked for drift from the desired state."`
 	MaxConcurrentPackageEstablishers int           `default:"10"  help:"The the maximum number of goroutines to use for establishing Providers, Configurations and Functions."`
 
-	WebhookEnabled                      bool `default:"true" env:"WEBHOOK_ENABLED" help:"Enable webhook configuration."`
+	WebhookEnabled                      bool `default:"true"  env:"WEBHOOK_ENABLED"                        help:"Enable webhook configuration."`
 	AutomaticDependencyDowngradeEnabled bool `default:"false" env:"AUTOMATIC_DEPENDENCY_DOWNGRADE_ENABLED" help:"Enable automatic dependency version downgrades. This configuration requires the 'EnableDependencyVersionUpgrades' feature flag to be enabled."`
 
-	WebhookPort     int `default:"9443" env:"WEBHOOK_PORT"    help:"The port the webhook server listens on."`
-	MetricsPort     int `default:"8080" env:"METRICS_PORT" help:"The port the metrics server listens on."`
+	WebhookPort     int `default:"9443" env:"WEBHOOK_PORT"      help:"The port the webhook server listens on."`
+	MetricsPort     int `default:"8080" env:"METRICS_PORT"      help:"The port the metrics server listens on."`
 	HealthProbePort int `default:"8081" env:"HEALTH_PROBE_PORT" help:"The port the health probe endpoint listens on."`
 
 	TLSServerSecretName string `env:"TLS_SERVER_SECRET_NAME" help:"The name of the TLS Secret that will store Crossplane's server certificate."`

internal/controller/pkg/revision/runtime_defaults.go

@@ -65,18 +65,16 @@ func deploymentFromRuntimeConfig(tmpl *v1beta1.DeploymentTemplate) *appsv1.Deplo
 func serviceFromRuntimeConfig(tmpl *v1beta1.ServiceTemplate) *corev1.Service {
 	svc := &corev1.Service{}
 
-	if tmpl == nil {
+	if tmpl == nil || tmpl.Metadata == nil {
 		return svc
 	}
 
-	if meta := tmpl.Metadata; meta != nil {
-		if meta.Name != nil {
-			svc.Name = *meta.Name
-		}
-
-		svc.Annotations = meta.Annotations
-		svc.Labels = meta.Labels
+	if tmpl.Metadata.Name != nil {
+		svc.Name = *tmpl.Metadata.Name
 	}
 
+	svc.Annotations = tmpl.Metadata.Annotations
+	svc.Labels = tmpl.Metadata.Labels
+
 	return svc
 }

internal/controller/pkg/revision/runtime_test.go

@@ -473,7 +473,7 @@ func TestRuntimeManifestBuilderService(t *testing.T) {
 		want   want
 	}{
 		"ProviderServiceNoRuntimeConfig": {
-			reason: "No overrides should result in a deployment with default values",
+			reason: "No runtime config on the builder should result in a service with default values",
 			args: args{
 				builder: &RuntimeManifestBuilder{
 					revision:  providerRevision,
@@ -484,10 +484,10 @@ func TestRuntimeManifestBuilderService(t *testing.T) {
 					ServiceWithSelectors(providerSelectors(&pkgmetav1.Provider{ObjectMeta: metav1.ObjectMeta{Name: providerMetaName}}, providerRevision)),
 					ServiceWithAdditionalPorts([]corev1.ServicePort{
 						{
-							Name:       grpcPortName,
+							Name:       webhookPortName,
 							Protocol:   corev1.ProtocolTCP,
 							Port:       servicePort,
-							TargetPort: intstr.FromString(grpcPortName),
+							TargetPort: intstr.FromString(webhookPortName),
 						},
 					}),
 				},
@@ -514,9 +514,9 @@ func TestRuntimeManifestBuilderService(t *testing.T) {
 						},
 						Ports: []corev1.ServicePort{
 							{
-								Name:       grpcPortName,
+								Name:       webhookPortName,
 								Port:       int32(servicePort),
-								TargetPort: intstr.FromString(grpcPortName),
+								TargetPort: intstr.FromString(webhookPortName),
 								Protocol:   corev1.ProtocolTCP,
 							},
 						},