Skip to content
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

Jump to bottom

STOR-1433: Restart azure-disk-csi-driver-controller Pods if metrics-serving-cert changed #91

Merged
merged 2 commits into from
Aug 7, 2023
Merged

STOR-1433: Restart azure-disk-csi-driver-controller Pods if metrics-serving-cert changed #91

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9a04a0
Restart controller Pods if metrics-serving-cert changed
Phaow Aug 4, 2023
682453a
Remove redundant action
Phaow Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ const (
operatorName = "azure-disk-csi-driver-operator"
operandName = "azure-disk-csi-driver"
openShiftConfigNamespace = "openshift-config"
secretName = "azure-disk-credentials"
cloudCredSecretName = "azure-disk-credentials"
metricsCertSecretName = "azure-disk-csi-driver-controller-metrics-serving-cert"
tokenFileKey = "azure_federated_token_file"
trustedCAConfigMap = "azure-disk-csi-driver-trusted-ca-bundle"
resync = 20 * time.Minute
Expand Down Expand Up @@ -206,7 +207,8 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
),
csidrivercontrollerservicecontroller.WithReplicasHook(nodeInformer.Lister()),
azurestackhub.WithAzureStackHubDeploymentHook(runningOnAzureStackHub),
csidrivercontrollerservicecontroller.WithSecretHashAnnotationHook(defaultNamespace, secretName, secretInformer),
csidrivercontrollerservicecontroller.WithSecretHashAnnotationHook(defaultNamespace, cloudCredSecretName, secretInformer),
csidrivercontrollerservicecontroller.WithSecretHashAnnotationHook(defaultNamespace, metricsCertSecretName, secretInformer),
).WithCSIDriverNodeService(
"AzureDiskDriverNodeServiceController",
replacedAssets.GetAssetFunc(),
Expand All @@ -216,7 +218,8 @@ func RunOperator(ctx context.Context, controllerConfig *controllercmd.Controller
[]factory.Informer{
secretInformer.Informer(),
},
csidrivernodeservicecontroller.WithSecretHashAnnotationHook(defaultNamespace, secretName, secretInformer),
csidrivernodeservicecontroller.WithSecretHashAnnotationHook(defaultNamespace, cloudCredSecretName, secretInformer),
csidrivernodeservicecontroller.WithSecretHashAnnotationHook(defaultNamespace, metricsCertSecretName, secretInformer),
Phaow marked this conversation as resolved.
Show resolved Hide resolved
csidrivernodeservicecontroller.WithObservedProxyDaemonSetHook(),
csidrivernodeservicecontroller.WithCABundleDaemonSetHook(
defaultNamespace,
Expand Down Expand Up @@ -296,13 +299,13 @@ func isWorkloadIdentityEnabled(featureGates featuregates.FeatureGate, kubeClient
if !featureGates.Enabled(configv1.FeatureGateAzureWorkloadIdentity) {
return false, nil
}
secret, err := kubeClient.CoreV1().Secrets(defaultNamespace).Get(context.Background(), secretName, metav1.GetOptions{})
secret, err := kubeClient.CoreV1().Secrets(defaultNamespace).Get(context.Background(), cloudCredSecretName, metav1.GetOptions{})
if err != nil {
return false, fmt.Errorf("could not get secret %s/%s: %v", defaultNamespace, secretName, err)
return false, fmt.Errorf("could not get secret %s/%s: %v", defaultNamespace, cloudCredSecretName, err)
}
_, hasKey := secret.Data[tokenFileKey]
if !hasKey {
klog.Warningf("Workloads Identity feature will be disabled: feature gate is enabled, but secret %s/%s doesn't have the %q key.", defaultNamespace, secretName, tokenFileKey)
klog.Warningf("Workloads Identity feature will be disabled: feature gate is enabled, but secret %s/%s doesn't have the %q key.", defaultNamespace, cloudCredSecretName, tokenFileKey)
}
return hasKey, nil
}