rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-06-27 23:46:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #62 from kairos-io/1477-fix-osbuilder-tests

Browse Source 
Remove old parameters (no longer supported)
This commit is contained in:
Dimitris Karakasilis 2023-06-23 14:31:46 +03:00 committed by GitHub
commit 893de1cc1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 124 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/default/manager_auth_proxy_patch.yaml
View File

@ -38,7 +38,3 @@ spec:
- "--health-probe-bind-address=:8081" - "--health-probe-bind-address=:8081"
- "--metrics-bind-address=127.0.0.1:8080" - "--metrics-bind-address=127.0.0.1:8080"
- "--leader-elect" - "--leader-elect"
- "--copy-to-namespace=$(NGINX_NAMESPACE)"
- "--copy-role=$(ARTIFACT_COPIER_ROLE)"
- --copy-to-pod-label=app.kubernetes.io/name=osbuilder-nginx
- --copy-to-path="/usr/share/nginx/html"

45
tests/e2e/e2e_simple_test.go
View File

@ -2,6 +2,8 @@ package e2e_test
import ( import (
"context" "context"
"time"
osbuilder "github.com/kairos-io/osbuilder/api/v1alpha2" osbuilder "github.com/kairos-io/osbuilder/api/v1alpha2"
. "github.com/onsi/ginkgo/v2" . "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
@ -16,19 +18,24 @@ import (
"k8s.io/apimachinery/pkg/watch" "k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/dynamic" "k8s.io/client-go/dynamic"
ctrl "sigs.k8s.io/controller-runtime" ctrl "sigs.k8s.io/controller-runtime"
"time"
) )
var _ = Describe("ISO build test", func() { var _ = Describe("ISO build test", func() {
k8s := dynamic.NewForConfigOrDie(ctrl.GetConfigOrDie())
scheme := runtime.NewScheme()
_ = osbuilder.AddToScheme(scheme)
var artifactName string var artifactName string
artifacts := k8s.Resource(schema.GroupVersionResource{Group: osbuilder.GroupVersion.Group, Version: osbuilder.GroupVersion.Version, Resource: "osartifacts"}).Namespace("default") var artifacts, pods, pvcs, jobs dynamic.ResourceInterface
pods := k8s.Resource(schema.GroupVersionResource{Group: corev1.GroupName, Version: corev1.SchemeGroupVersion.Version, Resource: "pods"}).Namespace("default") var scheme *runtime.Scheme
pvcs := k8s.Resource(schema.GroupVersionResource{Group: corev1.GroupName, Version: corev1.SchemeGroupVersion.Version, Resource: "persistentvolumeclaims"}).Namespace("default") var artifactLabelSelector labels.Selector
jobs := k8s.Resource(schema.GroupVersionResource{Group: batchv1.GroupName, Version: batchv1.SchemeGroupVersion.Version, Resource: "jobs"}).Namespace("default")
BeforeEach(func() {
k8s := dynamic.NewForConfigOrDie(ctrl.GetConfigOrDie())
scheme = runtime.NewScheme()
err := osbuilder.AddToScheme(scheme)
Expect(err).ToNot(HaveOccurred())
artifacts = k8s.Resource(schema.GroupVersionResource{Group: osbuilder.GroupVersion.Group, Version: osbuilder.GroupVersion.Version, Resource: "osartifacts"}).Namespace("default")
pods = k8s.Resource(schema.GroupVersionResource{Group: corev1.GroupName, Version: corev1.SchemeGroupVersion.Version, Resource: "pods"}).Namespace("default")
pvcs = k8s.Resource(schema.GroupVersionResource{Group: corev1.GroupName, Version: corev1.SchemeGroupVersion.Version, Resource: "persistentvolumeclaims"}).Namespace("default")
jobs = k8s.Resource(schema.GroupVersionResource{Group: batchv1.GroupName, Version: batchv1.SchemeGroupVersion.Version, Resource: "jobs"}).Namespace("default")
artifact := &osbuilder.OSArtifact{ artifact := &osbuilder.OSArtifact{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
@ -75,11 +82,13 @@ var _ = Describe("ISO build test", func() {
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
artifactName = resp.GetName() artifactName = resp.GetName()
Context("simple", func() { artifactLabelSelectorReq, err := labels.NewRequirement("build.kairos.io/artifact", selection.Equals, []string{artifactName})
artifactLabelSelectorReq, _ := labels.NewRequirement("build.kairos.io/artifact", selection.Equals, []string{artifactName}) Expect(err).ToNot(HaveOccurred())
artifactLabelSelector := labels.NewSelector().Add(*artifactLabelSelectorReq) artifactLabelSelector = labels.NewSelector().Add(*artifactLabelSelectorReq)
})
It("starts the build", func() { It("works", func() {
By("starting the build")
Eventually(func(g Gomega) { Eventually(func(g Gomega) {
w, err := pods.Watch(context.TODO(), metav1.ListOptions{LabelSelector: artifactLabelSelector.String()}) w, err := pods.Watch(context.TODO(), metav1.ListOptions{LabelSelector: artifactLabelSelector.String()})
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -91,9 +100,8 @@ var _ = Describe("ISO build test", func() {
stopped = event.Type != watch.Deleted && event.Type != watch.Error || !ok stopped = event.Type != watch.Deleted && event.Type != watch.Error || !ok
} }
}).WithTimeout(time.Hour).Should(Succeed()) }).WithTimeout(time.Hour).Should(Succeed())
})
It("exports the artifacts", func() { By("exporting the artifacts")
Eventually(func(g Gomega) { Eventually(func(g Gomega) {
w, err := jobs.Watch(context.TODO(), metav1.ListOptions{LabelSelector: artifactLabelSelector.String()}) w, err := jobs.Watch(context.TODO(), metav1.ListOptions{LabelSelector: artifactLabelSelector.String()})
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -105,9 +113,8 @@ var _ = Describe("ISO build test", func() {
stopped = event.Type != watch.Deleted && event.Type != watch.Error || !ok stopped = event.Type != watch.Deleted && event.Type != watch.Error || !ok
} }
}).WithTimeout(time.Hour).Should(Succeed()) }).WithTimeout(time.Hour).Should(Succeed())
})
It("artifact successfully builds", func() { By("building the artifacts successfully")
Eventually(func(g Gomega) { Eventually(func(g Gomega) {
w, err := artifacts.Watch(context.TODO(), metav1.ListOptions{}) w, err := artifacts.Watch(context.TODO(), metav1.ListOptions{})
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -126,9 +133,8 @@ var _ = Describe("ISO build test", func() {
} }
}).WithTimeout(time.Hour).Should(Succeed()) }).WithTimeout(time.Hour).Should(Succeed())
})
It("cleans up resources on deleted", func() { By("cleaning up resources on deletion")
err := artifacts.Delete(context.TODO(), artifactName, metav1.DeleteOptions{}) err := artifacts.Delete(context.TODO(), artifactName, metav1.DeleteOptions{})
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
@ -153,5 +159,4 @@ var _ = Describe("ISO build test", func() {
return len(res.Items) return len(res.Items)
}).WithTimeout(time.Minute).Should(Equal(0)) }).WithTimeout(time.Minute).Should(Equal(0))
}) })
})
}) })