This repository has been archived by the owner on Dec 4, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 21
[D2IQ-71860] Ambassador Preview #524
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
Validating CODEOWNERS rules …
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,49 @@ | ||
| # ------------------------------------------------------------------------------ | ||
| # PREVIEW: this addon is in preview mode and only intended for use in testing environments. | ||
| # ------------------------------------------------------------------------------ | ||
| apiVersion: kubeaddons.mesosphere.io/v1beta2 | ||
| kind: ClusterAddon | ||
| metadata: | ||
| name: ambassador | ||
| labels: | ||
| kubeaddons.mesosphere.io/name: ambassador | ||
| kubeaddons.mesosphere.io/provides: ingresscontroller | ||
| annotations: | ||
| catalog.kubeaddons.mesosphere.io/addon-revision: "6.5.6-1" | ||
| appversion.kubeaddons.mesosphere.io/ambassador: "1.7.2" | ||
| docs.kubeaddons.mesosphere.io/ambassador: "https://www.getambassador.io/docs/1.7/" | ||
| values.chart.helm.kubeaddons.mesosphere.io/ambassador: "https://raw.githubusercontent.com/datawire/ambassador-chart/d082fc2f2bc563726f5a940ad48b1b005fb85ef9/values.yaml" | ||
| spec: | ||
| kubernetes: | ||
| minSupportedVersion: v1.17.11 | ||
| cloudProvider: | ||
| - name: aws | ||
| enabled: false | ||
| - name: gcp | ||
| enabled: false | ||
| - name: azure | ||
| enabled: false | ||
| - name: docker | ||
| enabled: false | ||
| - name: vsphere | ||
| enabled: false | ||
| # TODO: at the time of writing there are several changes in flight for our cert-manager addon and we're holding on cert-manager integration until a follow-up iteration | ||
| # requires: | ||
| # - matchLabels: | ||
| # kubeaddons.mesosphere.io/name: cert-manager | ||
| chartReference: | ||
| chart: ambassador | ||
| repo: https://getambassador.io | ||
| version: 6.5.6 | ||
| values: | | ||
| enableAES: false # use the OSS features | ||
| image: | ||
| repository: "datawire/ambassador" # use the OSS image | ||
| tag: 1.7.2 | ||
| rbac: | ||
| create: true | ||
| resources: | ||
| limits: | ||
| cpu: 1000m | ||
| requests: | ||
| cpu: 500m |
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,153 @@ | ||
| package test | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "io/ioutil" | ||
| "net/http" | ||
| "testing" | ||
| "time" | ||
|
|
||
| ambassadorv2 "github.com/datawire/ambassador/pkg/api/getambassador.io/v2" | ||
| testcluster "github.com/mesosphere/ksphere-testing-framework/pkg/cluster" | ||
| testharness "github.com/mesosphere/ksphere-testing-framework/pkg/harness" | ||
| "github.com/mesosphere/kubeaddons/pkg/api/v1beta2" | ||
| "github.com/mesosphere/kubeaddons/pkg/constants" | ||
| appsv1 "k8s.io/api/apps/v1" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| k8sruntime "k8s.io/apimachinery/pkg/runtime" | ||
| "k8s.io/apimachinery/pkg/util/intstr" | ||
| kscheme "k8s.io/client-go/kubernetes/scheme" | ||
| "k8s.io/utils/pointer" | ||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/client/apiutil" | ||
| ) | ||
|
|
||
| const waitForAmbassador = time.Minute * 1 | ||
|
|
||
| func ambassadorChecker(t *testing.T, cluster testcluster.Cluster) testharness.Job { | ||
| return func(t *testing.T) error { | ||
| app := "quote" | ||
| ns := "default" | ||
|
|
||
| // create a test application to ensure proper connectivity | ||
| testDeployment := appsv1.Deployment{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: app, | ||
| Namespace: ns, | ||
| }, | ||
| Spec: appsv1.DeploymentSpec{ | ||
| Replicas: pointer.Int32Ptr(1), | ||
| Selector: &metav1.LabelSelector{MatchLabels: map[string]string{"app": app}}, | ||
| Template: corev1.PodTemplateSpec{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Labels: map[string]string{"app": app}, | ||
| }, | ||
| Spec: corev1.PodSpec{ | ||
| Containers: []corev1.Container{{ | ||
| Name: "backend", | ||
| Image: "docker.io/datawire/quote:0.4.1", | ||
| Ports: []corev1.ContainerPort{{ | ||
| Name: "http", | ||
| ContainerPort: 8080, | ||
| }}}}}}}} | ||
| deployment, err := cluster.Client().AppsV1().Deployments(ns).Create(context.TODO(), &testDeployment, metav1.CreateOptions{}) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| // create the svc for the | ||
| testService := corev1.Service{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: app, | ||
| Namespace: ns, | ||
| }, | ||
| Spec: corev1.ServiceSpec{ | ||
| Ports: []corev1.ServicePort{{ | ||
| Name: "http", | ||
| Port: 80, | ||
| TargetPort: intstr.FromInt(8080), | ||
| }}, | ||
| Selector: map[string]string{ | ||
| "app": deployment.Name, | ||
| }}} | ||
| svc, err := cluster.Client().CoreV1().Services(ns).Create(context.TODO(), &testService, metav1.CreateOptions{}) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| // create a dynamic client for ambassador's API | ||
| scheme := k8sruntime.NewScheme() | ||
| if err := kscheme.AddToScheme(scheme); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if err := ambassadorv2.AddToScheme(scheme); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if err := v1beta2.AddToScheme(scheme); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| mapper, err := apiutil.NewDynamicRESTMapper(cluster.Config()) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| c, err := client.New(cluster.Config(), client.Options{Scheme: scheme, Mapper: mapper}) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| // create a mapping for traffic to the service | ||
| apptestMapping := ambassadorv2.Mapping{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: fmt.Sprintf("%s-backend", app), | ||
| Namespace: ns, | ||
| }, | ||
| Spec: ambassadorv2.MappingSpec{ | ||
| Prefix: "/backend/", | ||
| Service: svc.Name, | ||
| }} | ||
| if err := c.Create(context.TODO(), &apptestMapping); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| // I've checked with upstream, even though there's a status available in the Mapping API, they don't use it since several | ||
| // versions ago, so for the time being we just give the mapping a reasonable amount of time to resolve. | ||
| time.Sleep(time.Second * 10) | ||
|
|
||
| // get the svc IP for ambassador | ||
| localport, stop, err := portForwardPodWithPrefix(cluster, constants.DefaultAddonNamespace, "ambassador", "8080") | ||
| if err != nil { | ||
| return fmt.Errorf("could not forward port to elasticsearch client pod: %s", err) | ||
| } | ||
| defer close(stop) | ||
|
|
||
| // make sure requests to the test application are successful | ||
| resp, err := http.Get(fmt.Sprintf("http://localhost:%d/backend/", localport)) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| defer resp.Body.Close() | ||
| if resp.StatusCode != http.StatusOK { | ||
| t.Fatalf("expected 200 OK from ambassador backend, got %s", resp.Status) | ||
| } | ||
|
|
||
| // check the contents of the response | ||
| b, err := ioutil.ReadAll(resp.Body) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| data := make(map[string]string) | ||
| if err := json.Unmarshal(b, &data); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| qotd, ok := data["quote"] | ||
| if !ok { | ||
| t.Fatalf("structure of output from test app did not include \"quote\" key: %+v", data) | ||
| } | ||
|
|
||
| t.Logf("INFO: ambassador tests complete, mapping connectivity verified! quote of the day is: %s", qotd) | ||
| 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we want to wait for deployment to finish before we continue?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You're right that we probably do want to do this, I'll make an update for it.