Add option for operator to integration tests #18991
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,8 +96,6 @@ mixer: | |
| adapters: | ||
| stdio: | ||
| enabled: true | ||
|
|
||
| sidecarInjectorWebhook: | ||
| rewriteAppHTTPProbe: true | ||
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,183 @@ | ||
| // Copyright 2019 Istio Authors | ||
| // | ||
| // 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 istio | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "io" | ||
| "io/ioutil" | ||
| "os" | ||
| "path" | ||
| "path/filepath" | ||
|
|
||
| "istio.io/istio/pkg/test/deployment" | ||
| "istio.io/istio/pkg/test/framework/components/environment/kube" | ||
| "istio.io/istio/pkg/test/framework/components/istioctl" | ||
| "istio.io/istio/pkg/test/framework/core/image" | ||
| "istio.io/istio/pkg/test/framework/resource" | ||
| "istio.io/istio/pkg/test/scopes" | ||
| ) | ||
|
|
||
| type operatorComponent struct { | ||
| id resource.ID | ||
| settings Config | ||
| ctx resource.Context | ||
| environment *kube.Environment | ||
| } | ||
|
|
||
| var _ io.Closer = &operatorComponent{} | ||
| var _ Instance = &operatorComponent{} | ||
| var _ resource.Dumper = &operatorComponent{} | ||
|
|
||
| // ID implements resource.Instance | ||
| func (i *operatorComponent) ID() resource.ID { | ||
| return i.id | ||
| } | ||
|
|
||
| func (i *operatorComponent) Settings() Config { | ||
| return i.settings | ||
| } | ||
|
|
||
| func (i *operatorComponent) Close() (err error) { | ||
| scopes.CI.Infof("=== BEGIN: Cleanup Istio ===") | ||
| defer scopes.CI.Infof("=== DONE: Cleanup Istio ===") | ||
| if i.settings.DeployIstio { | ||
|
There was a problem hiding this comment. We should delete using the operator as well. An There was a problem hiding this comment. Does it work? That was the way helm was documented but the helm tests do a delete of the namespace, not sure if that was intentional. I guess testing the delete should be part of the test though, so if it doesn't work we need to fix it There was a problem hiding this comment. yep. deletion must be tested as well. |
||
| err = i.environment.Accessor.DeleteNamespace(i.settings.SystemNamespace) | ||
| if err == nil { | ||
| err = i.environment.Accessor.WaitForNamespaceDeletion(i.settings.SystemNamespace) | ||
| } | ||
| // Note: when cleaning up an Istio deployment, ValidatingWebhookConfiguration | ||
| // and MutatingWebhookConfiguration must be cleaned up. Otherwise, next | ||
| // Istio deployment in the cluster will be impacted, causing flaky test results. | ||
| // Clean up ValidatingWebhookConfiguration, if any | ||
| _ = i.environment.DeleteValidatingWebhook(DefaultValidatingWebhookConfigurationName) | ||
| // Clean up MutatingWebhookConfiguration, if any | ||
| _ = i.environment.DeleteMutatingWebhook(DefaultMutatingWebhookConfigurationName) | ||
| } | ||
| return | ||
| } | ||
|
|
||
| func (i *operatorComponent) Dump() { | ||
| scopes.CI.Errorf("=== Dumping Istio Deployment State...") | ||
|
|
||
| d, err := i.ctx.CreateTmpDirectory("istio-state") | ||
| if err != nil { | ||
| scopes.CI.Errorf("Unable to create directory for dumping Istio contents: %v", err) | ||
| return | ||
| } | ||
|
|
||
| deployment.DumpPodState(d, i.settings.SystemNamespace, i.environment.Accessor) | ||
| deployment.DumpPodEvents(d, i.settings.SystemNamespace, i.environment.Accessor) | ||
|
|
||
| pods, err := i.environment.Accessor.GetPods(i.settings.SystemNamespace) | ||
| if err != nil { | ||
| scopes.CI.Errorf("Unable to get pods from the system namespace: %v", err) | ||
| return | ||
| } | ||
|
|
||
| for _, pod := range pods { | ||
| for _, container := range pod.Spec.Containers { | ||
| l, err := i.environment.Logs(pod.Namespace, pod.Name, container.Name, false /* previousLog */) | ||
| if err != nil { | ||
| scopes.CI.Errorf("Unable to get logs for pod/container: %s/%s/%s", pod.Namespace, pod.Name, container.Name) | ||
| continue | ||
| } | ||
|
|
||
| fname := path.Join(d, fmt.Sprintf("%s-%s.log", pod.Name, container.Name)) | ||
| if err = ioutil.WriteFile(fname, []byte(l), os.ModePerm); err != nil { | ||
| scopes.CI.Errorf("Unable to write logs for pod/container: %s/%s/%s", pod.Namespace, pod.Name, container.Name) | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func deployOperator(ctx resource.Context, env *kube.Environment, cfg Config) (Instance, error) { | ||
| scopes.CI.Infof("=== Istio Component Config ===") | ||
| scopes.CI.Infof("\n%s", cfg.String()) | ||
| scopes.CI.Infof("================================") | ||
|
|
||
| i := &operatorComponent{ | ||
| environment: env, | ||
| settings: cfg, | ||
| ctx: ctx, | ||
| } | ||
| i.id = ctx.TrackResource(i) | ||
|
|
||
| if !cfg.DeployIstio { | ||
| scopes.Framework.Info("skipping deployment due to Config") | ||
| return i, nil | ||
| } | ||
|
|
||
| istioCtl, err := istioctl.New(ctx, istioctl.Config{}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| // Top-level work dir for Istio deployment. | ||
| workDir, err := ctx.CreateTmpDirectory("istio-deployment") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| icpFile := filepath.Join(workDir, "icp.yaml") | ||
| if err := ioutil.WriteFile(icpFile, []byte(cfg.IstioControlPlane()), os.ModePerm); err != nil { | ||
|
There was a problem hiding this comment. any concern about There was a problem hiding this comment. Good point, I think this is actually normally returning |
||
| return nil, fmt.Errorf("failed to write icp: %v", err) | ||
| } | ||
| s, err := image.SettingsFromCommandLine() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| cmd := []string{ | ||
| "manifest", "apply", | ||
| "--skip-confirmation", | ||
| "--logtostderr", | ||
| "-f", icpFile, | ||
| "--force", // Blocked by https://github.com/istio/istio/issues/19009 | ||
| "--set", "values.global.controlPlaneSecurityEnabled=false", | ||
| "--set", "values.global.imagePullPolicy=" + s.PullPolicy, | ||
| } | ||
| // If control plane values set, assume this includes the full set of values, and .Values is | ||
| // just for helm use case. Otherwise, include all values. | ||
| if cfg.ControlPlaneValues == "" { | ||
| for k, v := range cfg.Values { | ||
| cmd = append(cmd, "--set", fmt.Sprintf("values.%s=%s", k, v)) | ||
| } | ||
| } | ||
|
|
||
| scopes.CI.Infof("Running istioctl %v", cmd) | ||
| if _, err := istioCtl.Invoke(cmd); err != nil { | ||
| return nil, fmt.Errorf("manifest apply failed: %v", err) | ||
| } | ||
|
|
||
| if !cfg.SkipWaitForValidationWebhook { | ||
|
|
||
| // Wait for Galley & the validation webhook to come online before continuing | ||
| if _, _, err = env.WaitUntilServiceEndpointsAreReady(cfg.SystemNamespace, "istio-galley"); err != nil { | ||
| err = fmt.Errorf("error waiting %s/istio-galley service endpoints: %v", cfg.SystemNamespace, err) | ||
| scopes.CI.Info(err.Error()) | ||
| i.Dump() | ||
| return nil, err | ||
| } | ||
|
|
||
| // Wait for webhook to come online. The only reliable way to do that is to see if we can submit invalid config. | ||
| err = waitForValidationWebhook(env.Accessor) | ||
| if err != nil { | ||
| i.Dump() | ||
| return nil, err | ||
| } | ||
| } | ||
|
|
||
| return i, 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
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
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.
Comment that this will be ignored if
ValuesFileis provided?