OTA-1559: test/extended/cli/admin: Add 'oc adm upgrade recommend' smoke test #29831
There are no files selected for viewing
This file contains hidden or 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 hidden or 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,293 @@ | ||
| package adm_upgrade | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "net" | ||
| "net/url" | ||
| "strconv" | ||
| "strings" | ||
| "text/template" | ||
| "time" | ||
|
|
||
| "github.com/blang/semver/v4" | ||
| g "github.com/onsi/ginkgo/v2" | ||
| o "github.com/onsi/gomega" | ||
| configv1 "github.com/openshift/api/config/v1" | ||
| exutil "github.com/openshift/origin/test/extended/util" | ||
| "github.com/openshift/origin/test/extended/util/image" | ||
| appsv1 "k8s.io/api/apps/v1" | ||
| corev1 "k8s.io/api/core/v1" | ||
| "k8s.io/apimachinery/pkg/api/resource" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/kubernetes/test/e2e/framework" | ||
| ) | ||
|
|
||
| var _ = g.Describe("[Serial][sig-cli] oc adm upgrade recommend", g.Ordered, func() { | ||
| defer g.GinkgoRecover() | ||
| ctx := context.Background() | ||
|
|
||
| f := framework.NewDefaultFramework("oc-adm-upgrade-recommend") | ||
| oc := exutil.NewCLIWithFramework(f).AsAdmin() | ||
| var cv *configv1.ClusterVersion | ||
| var restoreChannel, restoreUpstream bool | ||
|
|
||
| g.BeforeAll(func() { | ||
| isMicroShift, err := exutil.IsMicroShiftCluster(oc.AdminKubeClient()) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| if isMicroShift { | ||
| g.Skip("MicroShift does not have a ClusterVersion resource") | ||
| } | ||
|
|
||
| cv, err = oc.AdminConfigClient().ConfigV1().ClusterVersions().Get(ctx, "version", metav1.GetOptions{}) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| }) | ||
|
|
||
| g.AfterAll(func() { | ||
| if restoreChannel { | ||
| oc.Run("adm", "upgrade", "channel", cv.Spec.Channel).Execute() | ||
| } | ||
|
|
||
| if restoreUpstream { | ||
| oc.Run("patch", "clusterversions.config.openshift.io", "version", "--type", "json", "-p", fmt.Sprintf(`[{"op": "add", "path": "/spec/upstream", "value": "%s"}]`, cv.Spec.Upstream)).Execute() | ||
| } | ||
| }) | ||
|
|
||
| g.It("runs successfully, even without upstream OpenShift Update Service customization", func() { | ||
| _, err := oc.Run("adm", "upgrade", "recommend").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND", "true").Output() | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| }) | ||
|
|
||
| g.It("runs successfully with an empty channel", func() { | ||
| err := oc.Run("adm", "upgrade", "channel").Execute() | ||
| if err != nil { | ||
| g.Skip(fmt.Sprintf("failed to update the ClusterVersion channel (perhaps we are on a HyperShift cluster): %s", err)) | ||
|
Member
There was a problem hiding this comment. Do we want to use the function
Member
Author
There was a problem hiding this comment. There may be other systems that block our ability to set the channel via ClusterVersion (maybe Classic ROSA?), so I'd rather keep this generic for "do the thing we need to do to run the tests, and if it doesn't work, skip"). Unless we see that pattern breaking down somewhere?
Member
There was a problem hiding this comment. If we skip on errors, do we have a chance to spot the breaking down pattern?
Member
Author
There was a problem hiding this comment. I don't want to start failing CI suites over issues that are cluster-side and orthogonal to the |
||
| } | ||
| restoreChannel = true | ||
|
|
||
| out, err := oc.Run("adm", "upgrade", "recommend").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND", "true").Output() | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| err = matchRegexp(out, `.*The update channel has not been configured.*`) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| }) | ||
|
|
||
| g.Context("When the update service has no recommendations", func() { | ||
| g.BeforeAll(func() { | ||
| isHyperShift, err := exutil.IsHypershift(ctx, oc.AdminConfigClient()) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| if isHyperShift { | ||
| g.Skip("HyperShift does not support configuring the upstream OpenShift Update Service directoly via ClusterVersion (it must be configured via HostedCluster on the management cluster)") | ||
| } | ||
|
|
||
| graph := fmt.Sprintf(`{"nodes": [{"version": "%s","payload": "%s", "metadata": {"io.openshift.upgrades.graph.release.channels": "test-channel,other-channel"}}]}`, cv.Status.Desired.Version, cv.Status.Desired.Image) | ||
| newUpstream, err := runUpdateService(ctx, oc, graph) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
|
|
||
| err = oc.Run("adm", "upgrade", "channel", "test-channel").Execute() | ||
| if err != nil { | ||
| g.Skip(fmt.Sprintf("failed to update the ClusterVersion channel: %s", err)) | ||
| } | ||
| restoreChannel = true | ||
|
|
||
| err = oc.Run("patch", "clusterversions.config.openshift.io", "version", "--type", "json", "-p", fmt.Sprintf(`[{"op": "add", "path": "/spec/upstream", "value": "%s"}]`, newUpstream.String())).Execute() | ||
| if err != nil { | ||
| g.Skip(fmt.Sprintf("failed to update the ClusterVersion upstream: %s", err)) | ||
| } | ||
| restoreUpstream = true | ||
|
|
||
| time.Sleep(16 * time.Second) // Give the CVO time to retrieve recommendations and push to status | ||
| }) | ||
|
|
||
| g.It("runs successfully", func() { | ||
| out, err := oc.Run("adm", "upgrade", "recommend").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND", "true").Output() | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| err = matchRegexp(out, `.*Upstream update service: http://.* | ||
| Channel: test-channel [(]available channels: other-channel, test-channel[)] | ||
| No updates available. You may still upgrade to a specific release image.*`) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| }) | ||
| }) | ||
|
|
||
| g.Context("When the update service has conditional recommendations", func() { | ||
| var currentVersion *semver.Version | ||
|
|
||
| g.BeforeAll(func() { | ||
| isHyperShift, err := exutil.IsHypershift(ctx, oc.AdminConfigClient()) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| if isHyperShift { | ||
| g.Skip("HyperShift does not support configuring the upstream OpenShift Update Service directoly via ClusterVersion (it must be configured via HostedCluster on the management cluster)") | ||
| } | ||
|
|
||
| if curVer, err := semver.Parse(cv.Status.Desired.Version); err != nil { | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| } else { | ||
| currentVersion = &curVer | ||
| } | ||
|
|
||
| var buf strings.Builder | ||
| err = template.Must(template.New("letter").Parse(`{ | ||
| "nodes": [ | ||
| {"version": "{{.CurrentVersion}}","payload": "{{.CurrentImage}}", "metadata": {"io.openshift.upgrades.graph.release.channels": "test-channel,other-channel"}}, | ||
| {"version": "4.{{.CurrentMinor}}.998","payload": "example.com/test@sha256:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"}, | ||
| {"version": "4.{{.CurrentMinor}}.999","payload": "example.com/test@sha256:bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb"}, | ||
| {"version": "4.{{.NextMinor}}.0","payload": "example.com/test@sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc", "metadata": {"url": "https://example.com/release/4.{{.NextMinor}}.0"}} | ||
| ], | ||
| "edges": [[0, 1], [0, 2]], | ||
| "conditionalEdges": [ | ||
| { | ||
| "edges": [{"from": "{{.CurrentVersion}}", "to": "4.{{.NextMinor}}.0"}], | ||
| "risks": [ | ||
| { | ||
| "url": "https://example.com/testRiskA", | ||
| "name": "TestRiskA", | ||
| "message": "This is a test risk.", | ||
| "matchingRules": [{"type": "PromQL", "promql": {"promql": "group(cluster_version)"}}] | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }`)).Execute(&buf, struct { | ||
| CurrentVersion string | ||
| CurrentImage string | ||
| CurrentMinor uint64 | ||
| NextMinor uint64 | ||
| }{ | ||
| CurrentVersion: cv.Status.Desired.Version, | ||
| CurrentImage: cv.Status.Desired.Image, | ||
| CurrentMinor: currentVersion.Minor, | ||
| NextMinor: currentVersion.Minor + 1, | ||
| }) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| graph := buf.String() | ||
|
|
||
| newUpstream, err := runUpdateService(ctx, oc, graph) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
|
|
||
| err = oc.Run("adm", "upgrade", "channel", "test-channel").Execute() | ||
| if err != nil { | ||
| g.Skip(fmt.Sprintf("failed to update the ClusterVersion channel: %s", err)) | ||
| } | ||
| restoreChannel = true | ||
|
|
||
| err = oc.Run("patch", "clusterversions.config.openshift.io", "version", "--type", "json", "-p", fmt.Sprintf(`[{"op": "add", "path": "/spec/upstream", "value": "%s"}]`, newUpstream.String())).Execute() | ||
| if err != nil { | ||
| g.Skip(fmt.Sprintf("failed to update the ClusterVersion upstream: %s", err)) | ||
| } | ||
| restoreUpstream = true | ||
|
|
||
| time.Sleep(16 * time.Second) // Give the CVO time to retrieve recommendations and push to status | ||
| }) | ||
|
|
||
| g.It("runs successfully when listing all updates", func() { | ||
| out, err := oc.Run("adm", "upgrade", "recommend").EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND", "true").Output() | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| err = matchRegexp(out, `Upstream update service: http://.* | ||
| Channel: test-channel [(]available channels: other-channel, test-channel[)] | ||
|
|
||
| Updates to 4.[0-9]*: | ||
|
|
||
| Version: 4[.][0-9]*[.]0 | ||
| Image: example[.]com/test@sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc | ||
| Reason: (TestRiskA|MultipleReasons) | ||
| Message: (?s:.*)This is a test risk[.] https://example[.]com/testRiskA | ||
|
|
||
| Updates to 4[.][0-9]*: | ||
| VERSION *ISSUES | ||
| 4[.][0-9]*[.]999 *no known issues relevant to this cluster | ||
| 4[.][0-9]*[.]998 *no known issues relevant to this cluster`) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| }) | ||
|
|
||
| g.It("runs successfully with conditional recommendations to the --version target", func() { | ||
| out, err := oc.Run("adm", "upgrade", "recommend", "--version", fmt.Sprintf("4.%d.0", currentVersion.Minor+1)).EnvVar("OC_ENABLE_CMD_UPGRADE_RECOMMEND", "true").Output() | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| err = matchRegexp(out, `Upstream update service: http://.* | ||
| Channel: test-channel [(]available channels: other-channel, test-channel[)] | ||
|
|
||
| Update to 4[.][0-9]*[.]0 Recommended=False: | ||
| Image: example.com/test@sha256:cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccc | ||
| Release URL: https://example.com/release/4[.][0-9]*[.]0 | ||
| Reason: (TestRiskA|MultipleReasons) | ||
| Message: (?s:.*)This is a test risk. https://example.com/testRiskA`) | ||
| o.Expect(err).NotTo(o.HaveOccurred()) | ||
| }) | ||
| }) | ||
| }) | ||
|
|
||
| func runUpdateService(ctx context.Context, oc *exutil.CLI, graph string) (*url.URL, error) { | ||
| deployment, err := oc.AdminKubeClient().AppsV1().Deployments(oc.Namespace()).Create(ctx, | ||
| &appsv1.Deployment{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| GenerateName: "test-update-service-", | ||
| }, | ||
| Spec: appsv1.DeploymentSpec{ | ||
| Selector: &metav1.LabelSelector{ | ||
| MatchLabels: map[string]string{ | ||
| "app": "test-update-service", | ||
| }, | ||
| }, | ||
| Template: corev1.PodTemplateSpec{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Labels: map[string]string{ | ||
| "app": "test-update-service", | ||
| }, | ||
| }, | ||
| Spec: corev1.PodSpec{ | ||
| Containers: []corev1.Container{{ | ||
| Name: "update-service", | ||
| Image: image.ShellImage(), | ||
| Args: []string{ | ||
| "/bin/sh", | ||
| "-c", | ||
| fmt.Sprintf(`DIR="$(mktemp -d)" && | ||
| cd "${DIR}" && | ||
| printf '%%s' '%s' >graph && | ||
| python3 -m http.server --bind :: | ||
| `, graph), | ||
| }, | ||
| Ports: []corev1.ContainerPort{{ | ||
| Name: "update-service", | ||
| ContainerPort: 8000, | ||
| }}, | ||
| Resources: corev1.ResourceRequirements{ | ||
| Requests: corev1.ResourceList{ | ||
| corev1.ResourceCPU: resource.MustParse("10m"), | ||
| corev1.ResourceMemory: resource.MustParse("20Mi"), | ||
| }, | ||
| }, | ||
| }}, | ||
| }, | ||
| }, | ||
| }, | ||
| }, metav1.CreateOptions{}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| service, err := oc.AdminKubeClient().CoreV1().Services(oc.Namespace()).Create(ctx, | ||
| &corev1.Service{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: deployment.ObjectMeta.Name, | ||
| }, | ||
| Spec: corev1.ServiceSpec{ | ||
| Selector: deployment.Spec.Template.ObjectMeta.Labels, | ||
| Ports: []corev1.ServicePort{{ | ||
| Name: deployment.Spec.Template.Spec.Containers[0].Ports[0].Name, | ||
| Port: deployment.Spec.Template.Spec.Containers[0].Ports[0].ContainerPort, | ||
| }}, | ||
| }, | ||
| }, metav1.CreateOptions{}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if err = exutil.WaitForDeploymentReady(oc, deployment.ObjectMeta.Name, oc.Namespace(), -1); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| return &url.URL{ | ||
| Scheme: "http", | ||
| Host: net.JoinHostPort(service.Spec.ClusterIP, strconv.Itoa(int(service.Spec.Ports[0].Port))), | ||
| Path: "graph", | ||
| }, nil | ||
| } | ||
This file contains hidden or 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,41 @@ | ||
| package adm_upgrade | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "regexp" | ||
| "strings" | ||
| ) | ||
|
|
||
| // matchRegexp returns nil if the input string matches the pattern. | ||
| // If the input string does not match the pattern, it returns an error | ||
| // describing the difference. | ||
| func matchRegexp(input, pattern string) error { | ||
| re, err := regexp.Compile(pattern) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| if re.MatchString(input) { | ||
| return nil | ||
| } | ||
| patternFragment := pattern | ||
|
|
||
| // the full pattern did not match. Trim off portions until we find | ||
| // a match, to identify the point of divergence. | ||
| for { | ||
| if len(patternFragment) == 0 { | ||
| break | ||
| } | ||
| patternFragment = patternFragment[:len(patternFragment)-1] | ||
|
|
||
| re, err = regexp.Compile(patternFragment) | ||
| if err != nil { | ||
| continue | ||
| } | ||
|
|
||
| if re.MatchString(input) { | ||
| return fmt.Errorf("expected:\n %s\nto match regular expression:\n %s\nbut the longest pattern subset is:\n %s\nand the unmatched portion of the input is:\n %s", strings.ReplaceAll(input, "\n", "\n "), strings.ReplaceAll(pattern, "\n", "\n "), strings.ReplaceAll(patternFragment, "\n", "\n "), strings.ReplaceAll(re.ReplaceAllString(input, "<MATCHED>"), "\n", "\n ")) | ||
| } | ||
| } | ||
| return fmt.Errorf("expected:\n %s\nto match regular expression:\n %s\nbut no pattern subsets found any matches.", strings.ReplaceAll(input, "\n", "\n "), strings.ReplaceAll(pattern, "\n", "\n ")) | ||
| } |
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.
Uh oh!
There was an error while loading. Please reload this page.