-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
issue-522,implementation for OpenSearch Egress Rules lifecycle on APIv2
- Loading branch information
1 parent
f9f73a0
commit fadba6d
Showing
21 changed files
with
733 additions
and
0 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
64 changes: 64 additions & 0 deletions
64
apis/clusterresources/v1beta1/opensearchegressrules_types.go
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,64 @@ | ||
/* | ||
Copyright 2022. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package v1beta1 | ||
|
||
import ( | ||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
"sigs.k8s.io/controller-runtime/pkg/client" | ||
) | ||
|
||
type OpenSearchEgressRulesSpec struct { | ||
ClusterID string `json:"clusterId"` | ||
Name string `json:"name"` | ||
OpenSearchBindingID string `json:"openSearchBindingId"` | ||
Source string `json:"source"` | ||
Type string `json:"type,omitempty"` | ||
} | ||
|
||
type OpenSearchEgressRulesStatus struct { | ||
ID string `json:"id,omitempty"` | ||
} | ||
|
||
//+kubebuilder:object:root=true | ||
//+kubebuilder:subresource:status | ||
|
||
// OpenSearchEgressRules is the Schema for the opensearchegressrules API | ||
type OpenSearchEgressRules struct { | ||
metav1.TypeMeta `json:",inline"` | ||
metav1.ObjectMeta `json:"metadata,omitempty"` | ||
|
||
Spec OpenSearchEgressRulesSpec `json:"spec,omitempty"` | ||
Status OpenSearchEgressRulesStatus `json:"status,omitempty"` | ||
} | ||
|
||
//+kubebuilder:object:root=true | ||
|
||
// OpenSearchEgressRulesList contains a list of OpenSearchEgressRules | ||
type OpenSearchEgressRulesList struct { | ||
metav1.TypeMeta `json:",inline"` | ||
metav1.ListMeta `json:"metadata,omitempty"` | ||
Items []OpenSearchEgressRules `json:"items"` | ||
} | ||
|
||
func (er *OpenSearchEgressRules) NewPatch() client.Patch { | ||
old := er.DeepCopy() | ||
return client.MergeFrom(old) | ||
} | ||
|
||
func init() { | ||
SchemeBuilder.Register(&OpenSearchEgressRules{}, &OpenSearchEgressRulesList{}) | ||
} |
83 changes: 83 additions & 0 deletions
83
apis/clusterresources/v1beta1/opensearchegressrules_webhook.go
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,83 @@ | ||
/* | ||
Copyright 2022. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package v1beta1 | ||
|
||
import ( | ||
"fmt" | ||
"regexp" | ||
|
||
"k8s.io/apimachinery/pkg/runtime" | ||
ctrl "sigs.k8s.io/controller-runtime" | ||
logf "sigs.k8s.io/controller-runtime/pkg/log" | ||
"sigs.k8s.io/controller-runtime/pkg/webhook" | ||
|
||
"github.com/instaclustr/operator/pkg/models" | ||
) | ||
|
||
// log is for logging in this package. | ||
var opensearchegressruleslog = logf.Log.WithName("opensearchegressrules-resource") | ||
|
||
var openSearchBindingIDPattern, _ = regexp.Compile(`[\w-]+`) | ||
|
||
func (r *OpenSearchEgressRules) SetupWebhookWithManager(mgr ctrl.Manager) error { | ||
return ctrl.NewWebhookManagedBy(mgr). | ||
For(r). | ||
Complete() | ||
} | ||
|
||
//+kubebuilder:webhook:path=/validate-clusterresources-instaclustr-com-v1beta1-opensearchegressrules,mutating=false,failurePolicy=fail,sideEffects=None,groups=clusterresources.instaclustr.com,resources=opensearchegressrules,verbs=create;update,versions=v1beta1,name=vopensearchegressrules.kb.io,admissionReviewVersions=v1 | ||
|
||
var _ webhook.Validator = &OpenSearchEgressRules{} | ||
|
||
// ValidateCreate implements webhook.Validator so a webhook will be registered for the type | ||
func (r *OpenSearchEgressRules) ValidateCreate() error { | ||
opensearchegressruleslog.Info("validate create", "name", r.Name) | ||
|
||
if r.Spec.ClusterID == "" || r.Spec.OpenSearchBindingID == "" || r.Spec.Source == "" { | ||
return fmt.Errorf("clusterId, openSearchBindingId, source must be filled") | ||
} | ||
|
||
if !openSearchBindingIDPattern.MatchString(r.Spec.OpenSearchBindingID) { | ||
return fmt.Errorf("mismatching openSearchBindingId to [\\w-]+ pattern") | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// ValidateUpdate implements webhook.Validator so a webhook will be registered for the type | ||
func (r *OpenSearchEgressRules) ValidateUpdate(old runtime.Object) error { | ||
opensearchegressruleslog.Info("validate update", "name", r.Name) | ||
|
||
oldRules := old.(*OpenSearchEgressRules) | ||
|
||
if r.Status.ID == "" { | ||
return r.ValidateCreate() | ||
} | ||
|
||
if r.Spec != oldRules.Spec { | ||
return models.ErrImmutableSpec | ||
} | ||
|
||
return nil | ||
} | ||
|
||
// ValidateDelete implements webhook.Validator so a webhook will be registered for the type | ||
func (r *OpenSearchEgressRules) ValidateDelete() error { | ||
opensearchegressruleslog.Info("validate delete", "name", r.Name) | ||
|
||
return nil | ||
} |
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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
66 changes: 66 additions & 0 deletions
66
config/crd/bases/clusterresources.instaclustr.com_opensearchegressrules.yaml
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,66 @@ | ||
--- | ||
apiVersion: apiextensions.k8s.io/v1 | ||
kind: CustomResourceDefinition | ||
metadata: | ||
annotations: | ||
controller-gen.kubebuilder.io/version: v0.9.2 | ||
creationTimestamp: null | ||
name: opensearchegressrules.clusterresources.instaclustr.com | ||
spec: | ||
group: clusterresources.instaclustr.com | ||
names: | ||
kind: OpenSearchEgressRules | ||
listKind: OpenSearchEgressRulesList | ||
plural: opensearchegressrules | ||
singular: opensearchegressrules | ||
scope: Namespaced | ||
versions: | ||
- name: v1beta1 | ||
schema: | ||
openAPIV3Schema: | ||
description: OpenSearchEgressRules is the Schema for the opensearchegressrules | ||
API | ||
properties: | ||
apiVersion: | ||
description: 'APIVersion defines the versioned schema of this representation | ||
of an object. Servers should convert recognized schemas to the latest | ||
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' | ||
type: string | ||
kind: | ||
description: 'Kind is a string value representing the REST resource this | ||
object represents. Servers may infer this from the endpoint the client | ||
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' | ||
type: string | ||
metadata: | ||
type: object | ||
spec: | ||
properties: | ||
clusterId: | ||
type: string | ||
name: | ||
type: string | ||
openSearchBindingId: | ||
type: string | ||
source: | ||
type: string | ||
type: | ||
type: string | ||
required: | ||
- clusterId | ||
- name | ||
- openSearchBindingId | ||
- source | ||
- type | ||
type: object | ||
status: | ||
properties: | ||
id: | ||
type: string | ||
status: | ||
type: string | ||
type: object | ||
type: object | ||
served: true | ||
storage: true | ||
subresources: | ||
status: {} |
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
7 changes: 7 additions & 0 deletions
7
config/crd/patches/cainjection_in_clusterresources_opensearchegressrules.yaml
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,7 @@ | ||
# The following patch adds a directive for certmanager to inject CA into the CRD | ||
apiVersion: apiextensions.k8s.io/v1 | ||
kind: CustomResourceDefinition | ||
metadata: | ||
annotations: | ||
cert-manager.io/inject-ca-from: $(CERTIFICATE_NAMESPACE)/$(CERTIFICATE_NAME) | ||
name: opensearchegressrules.clusterresources.instaclustr.com |
16 changes: 16 additions & 0 deletions
16
config/crd/patches/webhook_in_clusterresources_opensearchegressrules.yaml
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,16 @@ | ||
# The following patch enables a conversion webhook for the CRD | ||
apiVersion: apiextensions.k8s.io/v1 | ||
kind: CustomResourceDefinition | ||
metadata: | ||
name: opensearchegressrules.clusterresources.instaclustr.com | ||
spec: | ||
conversion: | ||
strategy: Webhook | ||
webhook: | ||
clientConfig: | ||
service: | ||
namespace: system | ||
name: webhook-service | ||
path: /convert | ||
conversionReviewVersions: | ||
- v1 |
Oops, something went wrong.