-
Notifications
You must be signed in to change notification settings - Fork 459
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into add-certificate-rotate-threshold
- Loading branch information
Showing
20 changed files
with
123 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| // This file is part of MinIO Operator | ||
| // Copyright (c) 2021 MinIO, Inc. | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU Affero General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU Affero General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU Affero General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| package controller | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| miniov2 "github.com/minio/operator/pkg/apis/minio.min.io/v2" | ||
| "github.com/minio/operator/pkg/resources/services" | ||
| corev1 "k8s.io/api/core/v1" | ||
| k8serrors "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "k8s.io/klog/v2" | ||
| ) | ||
|
|
||
| // checkConsoleSvc validates the existence of the MinIO service and validate it's status against what the specification | ||
| // states | ||
| func (c *Controller) checkConsoleSvc(ctx context.Context, tenant *miniov2.Tenant, nsName types.NamespacedName) error { | ||
| // Handle the Internal ClusterIP Service for Tenant | ||
| svc, err := c.serviceLister.Services(tenant.Namespace).Get(tenant.ConsoleCIServiceName()) | ||
| if err != nil { | ||
| if k8serrors.IsNotFound(err) { | ||
| if tenant, err = c.updateTenantStatus(ctx, tenant, StatusProvisioningConsoleService, 0); err != nil { | ||
| return err | ||
| } | ||
| klog.V(2).Infof("Creating a new Console Cluster IP Service for cluster %q", nsName) | ||
| // Create the clusterIP service for the Tenant | ||
| svc = services.NewClusterIPForConsole(tenant) | ||
| svc, err = c.kubeClientSet.CoreV1().Services(tenant.Namespace).Create(ctx, svc, metav1.CreateOptions{}) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| c.recorder.Event(tenant, corev1.EventTypeNormal, "SvcCreated", "Console Service Created") | ||
| } else { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| // compare any other change from what is specified on the tenant | ||
| expectedSvc := services.NewClusterIPForConsole(tenant) | ||
|
|
||
| // check the expose status of the Console service | ||
| svcMatchesSpec, err := minioSvcMatchesSpecification(svc, expectedSvc) | ||
|
|
||
| // check the specification of the MinIO ClusterIP service | ||
| if !svcMatchesSpec { | ||
| if err != nil { | ||
| klog.Infof("Console Service don't match: %s. Conciliating", err) | ||
| } | ||
|
|
||
| svc.ObjectMeta.Annotations = expectedSvc.ObjectMeta.Annotations | ||
| svc.ObjectMeta.Labels = expectedSvc.ObjectMeta.Labels | ||
| svc.Spec.Ports = expectedSvc.Spec.Ports | ||
| // Only when ExposeServices is set an explicit value we do modifications to the service type | ||
| if tenant.Spec.ExposeServices != nil { | ||
| if tenant.Spec.ExposeServices.Console { | ||
| svc.Spec.Type = corev1.ServiceTypeLoadBalancer | ||
| } else { | ||
| svc.Spec.Type = corev1.ServiceTypeClusterIP | ||
| } | ||
| } | ||
|
|
||
| // update the selector | ||
| svc.Spec.Selector = expectedSvc.Spec.Selector | ||
|
|
||
| _, err = c.kubeClientSet.CoreV1().Services(tenant.Namespace).Update(ctx, svc, metav1.UpdateOptions{}) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| c.recorder.Event(tenant, corev1.EventTypeNormal, "Updated", "Console Service Updated") | ||
| } | ||
| return err | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters