You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ha...@apache.org on 2021/11/19 23:13:19 UTC
[skywalking-swck] branch master updated: fix bug (#48)
This is an automated email from the ASF dual-hosted git repository.
hanahmily pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/skywalking-swck.git
The following commit(s) were added to refs/heads/master by this push:
new 504020f fix bug (#48)
504020f is described below
commit 504020f5ba5c95ce7356f1d9f9d5ffb2f70022fd
Author: dashanji <71...@users.noreply.github.com>
AuthorDate: Sat Nov 20 07:13:16 2021 +0800
fix bug (#48)
---
controllers/operator/storage_controller.go | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/controllers/operator/storage_controller.go b/controllers/operator/storage_controller.go
index 999970f..e7a2112 100644
--- a/controllers/operator/storage_controller.go
+++ b/controllers/operator/storage_controller.go
@@ -125,7 +125,14 @@ func (r *StorageReconciler) checkState(ctx context.Context, log logr.Logger, sto
if err := r.Client.Get(ctx, object, &statefulset); err != nil && !apierrors.IsNotFound(err) {
errCol.Collect(fmt.Errorf("failed to get statefulset: %w", err))
} else {
- overlay.Conditions = statefulset.Status.Conditions
+ if statefulset.Status.ReadyReplicas == statefulset.Status.Replicas {
+ overlay.Conditions = append(overlay.Conditions, apps.StatefulSetCondition{
+ Type: "Ready",
+ Status: "True",
+ LastTransitionTime: metav1.NewTime(time.Now()),
+ Reason: "statefulset " + object.Name + " is ready",
+ })
+ }
}
if apiequal.Semantic.DeepDerivative(overlay, storage.Status) {
@@ -244,7 +251,7 @@ func (r *StorageReconciler) createCert(ctx context.Context, log logr.Logger, s *
log.Info("fail encode CERTIFICATE REQUEST")
return
}
- singername := "kubernetes.io/kubelet-serving"
+ singername := "kubernetes.io/legacy-unknown"
request := certv1beta1.CertificateSigningRequest{
TypeMeta: metav1.TypeMeta{
Kind: "CertificateSigningRequest",