-
Notifications
You must be signed in to change notification settings - Fork 114
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding sriov operator config controller finalizer, to enable generated
webhooks objects removal by sriov operator Signed-off-by: Ido Heyvi <[email protected]>
- Loading branch information
1 parent
450514e
commit 68c58bf
Showing
15 changed files
with
402 additions
and
233 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
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
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,68 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "os" | ||
|
|
||
| snolog "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/log" | ||
| "github.com/spf13/cobra" | ||
| "k8s.io/client-go/dynamic" | ||
|
|
||
| "k8s.io/client-go/rest" | ||
| "k8s.io/client-go/tools/clientcmd" | ||
| "sigs.k8s.io/controller-runtime/pkg/log" | ||
|
|
||
| sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/client/clientset/versioned/typed/sriovnetwork/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" | ||
| "k8s.io/apimachinery/pkg/runtime/schema" | ||
| ) | ||
|
|
||
| var ( | ||
| namespace string | ||
| ) | ||
|
|
||
| func init() { | ||
| rootCmd.Flags().StringVarP(&namespace, "namespace", "n", "", "designated SriovOperatorConfig namespace") | ||
| } | ||
|
|
||
| func DynamicClientFor(g schema.GroupVersionKind, obj *unstructured.Unstructured, namespace string) (dynamic.ResourceInterface, error) { | ||
| return nil, nil | ||
| } | ||
|
|
||
| func runCleanupCmd(cmd *cobra.Command, args []string) error { | ||
| var ( | ||
| config *rest.Config | ||
| err error | ||
| ) | ||
| // init logger | ||
| snolog.InitLog() | ||
| setupLog := log.Log.WithName("sriov-network-operator-config-cleanup") | ||
|
|
||
| setupLog.Info("Run sriov-network-operator-config-cleanup") | ||
|
|
||
| // creates the in-cluster config | ||
| kubeconfig := os.Getenv("KUBECONFIG") | ||
| if kubeconfig != "" { | ||
| config, err = clientcmd.BuildConfigFromFlags("", kubeconfig) | ||
| } else { | ||
| config, err = rest.InClusterConfig() | ||
| } | ||
| if err != nil { | ||
| setupLog.Error(err, "failed initialization k8s rest config") | ||
| } | ||
|
|
||
| sriovcs, err := sriovnetworkv1.NewForConfig(config) | ||
| if err != nil { | ||
| setupLog.Error(err, "failed to create 'sriovnetworkv1' clientset") | ||
| } | ||
|
|
||
| sriovcs.SriovOperatorConfigs(namespace).Delete(context.Background(), "default", metav1.DeleteOptions{}) | ||
| if err != nil { | ||
| setupLog.Error(err, "failed to delete SriovOperatorConfig") | ||
| return err | ||
| } | ||
|
|
||
| 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1" | ||
| "github.com/k8snetworkplumbingwg/sriov-network-operator/test/util" | ||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| "github.com/spf13/cobra" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/types" | ||
| ) | ||
|
|
||
| var ( | ||
| testNamespace string = "sriov-network-operator" | ||
| defaultSriovOperatorSpec = sriovnetworkv1.SriovOperatorConfigSpec{ | ||
| EnableInjector: true, | ||
| EnableOperatorWebhook: true, | ||
| LogLevel: 2, | ||
| FeatureGates: nil, | ||
| } | ||
| ) | ||
|
|
||
| var _ = Describe("cleanup", Ordered, func() { | ||
|
|
||
| defaultSriovOperatorConfig := &sriovnetworkv1.SriovOperatorConfig{ | ||
| ObjectMeta: metav1.ObjectMeta{Name: "default", Namespace: testNamespace}, | ||
| Spec: defaultSriovOperatorSpec, | ||
| } | ||
|
|
||
| BeforeEach(func() { | ||
| Expect(k8sClient.Create(context.Background(), defaultSriovOperatorConfig)).NotTo(HaveOccurred()) | ||
| err := util.WaitForNamespacedObject(defaultSriovOperatorConfig, k8sClient, testNamespace, "default", util.RetryInterval, util.APITimeout*3) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| It("test webhook cleanup flow", func() { | ||
| cmd := &cobra.Command{} | ||
| namespace = testNamespace | ||
| Expect(runCleanupCmd(cmd, []string{})).Should(Succeed()) | ||
|
|
||
| config := &sriovnetworkv1.SriovOperatorConfig{} | ||
| Expect(k8sClient.Get(context.Background(), types.NamespacedName{Name: "default", Namespace: testNamespace}, config)).To(MatchError( | ||
| ContainSubstring("sriovoperatorconfigs.sriovnetwork.openshift.io \"default\" not found"))) | ||
|
|
||
| }) | ||
| }) |
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,40 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "flag" | ||
| "os" | ||
|
|
||
| "github.com/spf13/cobra" | ||
| "k8s.io/klog/v2" | ||
| "sigs.k8s.io/controller-runtime/pkg/log" | ||
|
|
||
| snolog "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/log" | ||
| ) | ||
|
|
||
| const ( | ||
| componentName = "sriov-network-operator-config-cleanup" | ||
| ) | ||
|
|
||
| var ( | ||
| rootCmd = &cobra.Command{ | ||
| Use: componentName, | ||
| Short: "Removes 'default' SriovOperatorConfig", | ||
| Long: `Removes 'default' SriovOperatorConfig in order ro cleanup non-namespaced objects e.g clusterroles/clusterrolebinding/validating/mutating webhooks | ||
| Example: sriov-network-operator-config-cleanup -n <sriov-operator ns> -l <generated objects label selector>`, | ||
| RunE: runCleanupCmd, | ||
| } | ||
| ) | ||
|
|
||
| func init() { | ||
| klog.InitFlags(nil) | ||
| snolog.BindFlags(flag.CommandLine) | ||
| rootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine) | ||
| } | ||
|
|
||
| func main() { | ||
| if err := rootCmd.Execute(); err != nil { | ||
| log.Log.Error(err, "Error executing", componentName) | ||
| os.Exit(1) | ||
| } | ||
| } |
122 changes: 122 additions & 0 deletions
122
cmd/sriov-network-operator-config-cleanup/suite_test.go
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,122 @@ | ||
| package main | ||
|
|
||
| import ( | ||
| "context" | ||
| "io/fs" | ||
| "os" | ||
| "path/filepath" | ||
| "testing" | ||
| "time" | ||
|
|
||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| "go.uber.org/zap/zapcore" | ||
| corev1 "k8s.io/api/core/v1" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/client-go/kubernetes/scheme" | ||
| "k8s.io/client-go/rest" | ||
| logf "sigs.k8s.io/controller-runtime/pkg/log" | ||
|
|
||
| //+kubebuilder:scaffold:imports | ||
| sriovnetworkv1 "github.com/k8snetworkplumbingwg/sriov-network-operator/api/v1" | ||
| "github.com/k8snetworkplumbingwg/sriov-network-operator/pkg/vars" | ||
| "github.com/k8snetworkplumbingwg/sriov-network-operator/test/util" | ||
|
|
||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| "sigs.k8s.io/controller-runtime/pkg/envtest" | ||
| "sigs.k8s.io/controller-runtime/pkg/log/zap" | ||
| ) | ||
|
|
||
| var ( | ||
| k8sClient client.Client | ||
| testEnv *envtest.Environment | ||
| cfg *rest.Config | ||
| kubecfgPath string | ||
| ) | ||
|
|
||
| var _ = BeforeSuite(func() { | ||
|
|
||
| logf.SetLogger(zap.New( | ||
| zap.WriteTo(GinkgoWriter), | ||
| zap.UseDevMode(true), | ||
| func(o *zap.Options) { | ||
| o.TimeEncoder = zapcore.RFC3339NanoTimeEncoder | ||
| })) | ||
|
|
||
| // Go to project root directory | ||
| err := os.Chdir("../..") | ||
|
|
||
| By("bootstrapping test environment") | ||
| testEnv = &envtest.Environment{ | ||
| CRDDirectoryPaths: []string{filepath.Join("config", "crd", "bases"), filepath.Join("test", "util", "crds")}, | ||
| ErrorIfCRDPathMissing: true, | ||
| } | ||
|
|
||
| testEnv.ControlPlane.GetAPIServer().Configure().Set("disable-admission-plugins", "MutatingAdmissionWebhook", "ValidatingAdmissionWebhook") | ||
| cfg, err = testEnv.Start() | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(cfg).NotTo(BeNil()) | ||
|
|
||
| apiserverDir := testEnv.ControlPlane.GetAPIServer().CertDir | ||
| println("aprserver path:", apiserverDir) | ||
| kubecfgPath = findKubecfg(apiserverDir, ".kubecfg") | ||
| println("got kubecfg:", kubecfgPath) | ||
| err = os.Setenv("KUBECONFIG", kubecfgPath) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| By("registering schemes") | ||
| err = sriovnetworkv1.AddToScheme(scheme.Scheme) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| vars.Config = cfg | ||
| vars.Scheme = scheme.Scheme | ||
| vars.Namespace = testNamespace | ||
|
|
||
| By("creating K8s client") | ||
| k8sClient, err = client.New(cfg, client.Options{Scheme: scheme.Scheme}) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| Expect(k8sClient).NotTo(BeNil()) | ||
|
|
||
| By("creating default/common k8s objects for tests") | ||
| // Create test namespace | ||
| ns := &corev1.Namespace{ | ||
| TypeMeta: metav1.TypeMeta{}, | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: testNamespace, | ||
| }, | ||
| Spec: corev1.NamespaceSpec{}, | ||
| Status: corev1.NamespaceStatus{}, | ||
| } | ||
| ctx := context.Background() | ||
| Expect(k8sClient.Create(ctx, ns)).Should(Succeed()) | ||
| }) | ||
|
|
||
| var _ = AfterSuite(func() { | ||
| By("tearing down the test environment") | ||
| if testEnv != nil { | ||
| Eventually(func() error { | ||
| return testEnv.Stop() | ||
| }, util.APITimeout, time.Second).ShouldNot(HaveOccurred()) | ||
| } | ||
| }) | ||
|
|
||
| func findKubecfg(path, ext string) string { | ||
| var cfg string | ||
| filepath.WalkDir(path, func(s string, d fs.DirEntry, err error) error { | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if filepath.Ext(d.Name()) == ext { | ||
| cfg = s | ||
| } | ||
| return nil | ||
| }) | ||
| return cfg | ||
| } | ||
|
|
||
| func TestAPIs(t *testing.T) { | ||
| _, reporterConfig := GinkgoConfiguration() | ||
|
|
||
| RegisterFailHandler(Fail) | ||
|
|
||
| RunSpecs(t, "operator-webhook Suite", reporterConfig) | ||
| } |
Oops, something went wrong.