Skip to content

fix: nil pointer dereferences in private cluster reconciliation (v1.11.0-beta.0) #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pkieszcz wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: nil pointer dereferences in private cluster reconciliation (v1.11.0-beta.0) #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions cloud/services/container/clusters/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,27 +291,29 @@ func (s *Service) createCluster(ctx context.Context, log *logr.Logger) error {
}

if cn.PrivateCluster != nil {
cluster.PrivateClusterConfig = &containerpb.PrivateClusterConfig{}

enablePublicEndpoint := !cn.PrivateCluster.EnablePrivateEndpoint
cluster.ControlPlaneEndpointsConfig.IpEndpointsConfig.EnablePublicEndpoint = &enablePublicEndpoint

if cn.PrivateCluster.EnablePrivateEndpoint {
cluster.ControlPlaneEndpointsConfig.IpEndpointsConfig.AuthorizedNetworksConfig = &containerpb.MasterAuthorizedNetworksConfig{
Enabled: true,
}
}

cluster.NetworkConfig.DefaultEnablePrivateNodes = &cn.PrivateCluster.EnablePrivateNodes

cluster.PrivateClusterConfig.MasterIpv4CidrBlock = cn.PrivateCluster.ControlPlaneCidrBlock
cluster.ControlPlaneEndpointsConfig.IpEndpointsConfig.GlobalAccess = &cn.PrivateCluster.ControlPlaneGlobalAccess

// Initialize NetworkConfig before accessing DefaultEnablePrivateNodes
cluster.NetworkConfig = &containerpb.NetworkConfig{
DefaultSnatStatus: &containerpb.DefaultSnatStatus{
Disabled: cn.PrivateCluster.DisableDefaultSNAT,
},
}
cluster.NetworkConfig.DefaultEnablePrivateNodes = &cn.PrivateCluster.EnablePrivateNodes

cluster.PrivateClusterConfig = &containerpb.PrivateClusterConfig{
MasterIpv4CidrBlock: cn.PrivateCluster.ControlPlaneCidrBlock,
// EnablePrivateNodes is deprecated but GCP SDK raises an error if the value
// of this field is different from the value of NetworkConfig.DefaultEnablePrivateNodes
EnablePrivateNodes: cn.PrivateCluster.EnablePrivateNodes,
}
cluster.ControlPlaneEndpointsConfig.IpEndpointsConfig.GlobalAccess = &cn.PrivateCluster.ControlPlaneGlobalAccess
}
}

Expand Down Expand Up @@ -516,6 +518,12 @@ func (s *Service) checkDiffAndPrepareUpdate(existingCluster *containerpb.Cluster
desiredMasterAuthorizedNetworksConfig := convertToSdkMasterAuthorizedNetworksConfig(s.scope.GCPManagedControlPlane.Spec.MasterAuthorizedNetworksConfig)
if !compareMasterAuthorizedNetworksConfig(desiredMasterAuthorizedNetworksConfig, existingCluster.GetControlPlaneEndpointsConfig().GetIpEndpointsConfig().GetAuthorizedNetworksConfig()) {
needUpdate = true
if clusterUpdate.DesiredControlPlaneEndpointsConfig == nil {
clusterUpdate.DesiredControlPlaneEndpointsConfig = &containerpb.ControlPlaneEndpointsConfig{}
}
if clusterUpdate.DesiredControlPlaneEndpointsConfig.IpEndpointsConfig == nil {
clusterUpdate.DesiredControlPlaneEndpointsConfig.IpEndpointsConfig = &containerpb.ControlPlaneEndpointsConfig_IPEndpointsConfig{}
}
clusterUpdate.DesiredControlPlaneEndpointsConfig.IpEndpointsConfig.AuthorizedNetworksConfig = desiredMasterAuthorizedNetworksConfig
log.V(2).Info("Master authorized networks config update required", "current", existingCluster.GetControlPlaneEndpointsConfig().GetIpEndpointsConfig().GetAuthorizedNetworksConfig(), "desired", desiredMasterAuthorizedNetworksConfig)
}
Expand Down