Skip to content

Commit d6cf6e7

Browse files
committed
pass from api to input structs
1 parent 38b67fb commit d6cf6e7

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

controllers/microk8sconfig_controller.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,7 @@ func (r *MicroK8sConfigReconciler) handleClusterNotInitialized(ctx context.Conte
310310
ContainerdHTTPProxy: microk8sConfig.Spec.InitConfiguration.HTTPProxy,
311311
ContainerdHTTPSProxy: microk8sConfig.Spec.InitConfiguration.HTTPSProxy,
312312
ContainerdNoProxy: microk8sConfig.Spec.InitConfiguration.NoProxy,
313+
SnapstoreProxyScheme: microk8sConfig.Spec.InitConfiguration.SnapstoreProxyScheme,
313314
SnapstoreProxyDomain: microk8sConfig.Spec.InitConfiguration.SnapstoreProxyDomain,
314315
SnapstoreProxyId: microk8sConfig.Spec.InitConfiguration.SnapstoreProxyId,
315316
Confinement: microk8sConfig.Spec.InitConfiguration.Confinement,
@@ -414,6 +415,7 @@ func (r *MicroK8sConfigReconciler) handleJoiningControlPlaneNode(ctx context.Con
414415
ContainerdHTTPProxy: microk8sConfig.Spec.InitConfiguration.HTTPProxy,
415416
ContainerdHTTPSProxy: microk8sConfig.Spec.InitConfiguration.HTTPSProxy,
416417
ContainerdNoProxy: microk8sConfig.Spec.InitConfiguration.NoProxy,
418+
SnapstoreProxyScheme: microk8sConfig.Spec.InitConfiguration.SnapstoreProxyScheme,
417419
SnapstoreProxyDomain: microk8sConfig.Spec.InitConfiguration.SnapstoreProxyDomain,
418420
SnapstoreProxyId: microk8sConfig.Spec.InitConfiguration.SnapstoreProxyId,
419421
RiskLevel: microk8sConfig.Spec.InitConfiguration.RiskLevel,
@@ -515,6 +517,7 @@ func (r *MicroK8sConfigReconciler) handleJoiningWorkerNode(ctx context.Context,
515517
workerInput.ContainerdHTTPSProxy = c.HTTPSProxy
516518
workerInput.ContainerdHTTPProxy = c.HTTPProxy
517519
workerInput.ContainerdNoProxy = c.NoProxy
520+
workerInput.SnapstoreProxyScheme = c.SnapstoreProxyScheme
518521
workerInput.SnapstoreProxyDomain = c.SnapstoreProxyDomain
519522
workerInput.SnapstoreProxyId = c.SnapstoreProxyId
520523
workerInput.SnapstoreHTTPProxy = c.SnapstoreHTTPProxy

0 commit comments

Comments
 (0)