forked from GoogleCloudPlatform/k8s-config-connector
-
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.
Merge branch 'GoogleCloudPlatform:master' into configToBeta2
- Loading branch information
Showing
33 changed files
with
4,313 additions
and
21 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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 |
|---|---|---|
|
|
@@ -41,7 +41,7 @@ func (s *GlobalTargetTcpProxyV1) Get(ctx context.Context, req *pb.GetTargetTcpPr | |
|
|
||
| obj := &pb.TargetTcpProxy{} | ||
| if err := s.storage.Get(ctx, fqn, obj); err != nil { | ||
| return nil, err | ||
| return nil, status.Errorf(codes.NotFound, "The resource '%s' was not found", fqn) | ||
| } | ||
|
|
||
| return obj, nil | ||
|
|
@@ -63,6 +63,9 @@ func (s *GlobalTargetTcpProxyV1) Insert(ctx context.Context, req *pb.InsertTarge | |
| obj.CreationTimestamp = PtrTo(s.nowString()) | ||
| obj.Id = &id | ||
| obj.Kind = PtrTo("compute#targetTcpProxy") | ||
| if obj.ProxyHeader == nil { | ||
| obj.ProxyHeader = PtrTo("NONE") | ||
| } | ||
|
|
||
| if err := s.storage.Create(ctx, fqn, obj); err != nil { | ||
| return nil, err | ||
|
|
@@ -126,7 +129,7 @@ func (s *GlobalTargetTcpProxyV1) SetProxyHeader(ctx context.Context, req *pb.Set | |
| op := &pb.Operation{ | ||
| TargetId: obj.Id, | ||
| TargetLink: obj.SelfLink, | ||
| OperationType: PtrTo("setProxyHeader"), | ||
| OperationType: PtrTo("TargetTcpProxySetProxyHeader"), | ||
| User: PtrTo("[email protected]"), | ||
| } | ||
| return s.startGlobalLRO(ctx, name.Project.ID, op, func() (proto.Message, error) { | ||
|
|
||
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,100 @@ | ||
| // Copyright 2024 Google LLC | ||
| // | ||
| // 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 targettcpproxy | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/k8s" | ||
| apierrors "k8s.io/apimachinery/pkg/api/errors" | ||
|
|
||
| krm "github.com/GoogleCloudPlatform/k8s-config-connector/apis/compute/v1beta1" | ||
|
|
||
| refs "github.com/GoogleCloudPlatform/k8s-config-connector/apis/refs/v1beta1" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| ) | ||
|
|
||
| func ResolveComputeBackendService(ctx context.Context, reader client.Reader, src client.Object, ref *refs.ComputeBackendServiceRef) (*refs.ComputeBackendServiceRef, error) { | ||
| if ref == nil { | ||
| return nil, nil | ||
| } | ||
|
|
||
| if ref.External != "" { | ||
| if ref.Name != "" { | ||
| return nil, fmt.Errorf("cannot specify both name and external on reference") | ||
| } | ||
| return ref, nil | ||
| } | ||
|
|
||
| if ref.Name == "" { | ||
| return nil, fmt.Errorf("must specify either name or external on reference") | ||
| } | ||
|
|
||
| key := types.NamespacedName{ | ||
| Namespace: ref.Namespace, | ||
| Name: ref.Name, | ||
| } | ||
| if key.Namespace == "" { | ||
| key.Namespace = src.GetNamespace() | ||
| } | ||
|
|
||
| computeBackendService, err := resolveResourceName(ctx, reader, key, schema.GroupVersionKind{ | ||
| Group: "compute.cnrm.cloud.google.com", | ||
| Version: "v1beta1", | ||
| Kind: "ComputeBackendService", | ||
| }) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // targetField: self_link | ||
| // See compute servicemappings for details | ||
| selfLink, _, err := unstructured.NestedString(computeBackendService.Object, "status", "selfLink") | ||
| if err != nil || selfLink == "" { | ||
| return nil, fmt.Errorf("cannot get selfLink for referenced %s %v (status.selfLink is empty)", computeBackendService.GetKind(), computeBackendService.GetNamespace()) | ||
| } | ||
| return &refs.ComputeBackendServiceRef{ | ||
| External: selfLink}, nil | ||
| } | ||
|
|
||
| func resolveResourceName(ctx context.Context, reader client.Reader, key client.ObjectKey, gvk schema.GroupVersionKind) (*unstructured.Unstructured, error) { | ||
| resource := &unstructured.Unstructured{} | ||
| resource.SetGroupVersionKind(gvk) | ||
| if err := reader.Get(ctx, key, resource); err != nil { | ||
| if apierrors.IsNotFound(err) { | ||
| return nil, k8s.NewReferenceNotFoundError(resource.GroupVersionKind(), key) | ||
| } | ||
| return nil, fmt.Errorf("error reading referenced %v %v: %w", gvk.Kind, key, err) | ||
| } | ||
|
|
||
| return resource, nil | ||
| } | ||
|
|
||
| func resolveDependencies(ctx context.Context, reader client.Reader, obj *krm.ComputeTargetTCPProxy) error { | ||
| // Get backend service | ||
| if obj.Spec.BackendServiceRef != nil { | ||
| backendServiceRef, err := ResolveComputeBackendService(ctx, reader, obj, obj.Spec.BackendServiceRef) | ||
| if err != nil { | ||
| return err | ||
|
|
||
| } | ||
| obj.Spec.BackendServiceRef.External = backendServiceRef.External | ||
| } | ||
| return nil | ||
| } |
Oops, something went wrong.