Merge remote-tracking branch 'upstream/main' into AddPDB

Author: vicentefb

cmd/agent-sandbox-controller/main.go

@@ -22,11 +22,14 @@ import (
 	// to ensure that exec-entrypoint and run can make use of them.
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	"sigs.k8s.io/agent-sandbox/controllers"
+	extensionsv1alpha1 "sigs.k8s.io/agent-sandbox/extensions/api/v1alpha1"
+	extensionscontrollers "sigs.k8s.io/agent-sandbox/extensions/controllers"
 	//+kubebuilder:scaffold:imports
 )
 
@@ -38,11 +41,13 @@ func main() {
 	var metricsAddr string
 	var enableLeaderElection bool
 	var probeAddr string
+	var extensions bool
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
 		"Enable leader election for controller manager. "+
 			"Enabling this will ensure there is only one active controller manager.")
+	flag.BoolVar(&extensions, "extensions", false, "Enable extensions controllers.")
 	opts := zap.Options{
 		Development: true,
 	}
@@ -51,8 +56,13 @@ func main() {
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
 
+	scheme := controllers.Scheme
+	if extensions {
+		utilruntime.Must(extensionsv1alpha1.AddToScheme(scheme))
+	}
+
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
-		Scheme:                 controllers.Scheme,
+		Scheme:                 scheme,
 		HealthProbeBindAddress: probeAddr,
 		LeaderElection:         enableLeaderElection,
 		LeaderElectionID:       "a3317529.x-k8s.io",
@@ -75,6 +85,15 @@ func main() {
 		setupLog.Error(err, "unable to create controller", "controller", "SandboxPolicy")
 		os.Exit(1)
 	}
+	if extensions {
+		if err = (&extensionscontrollers.SandboxClaimReconciler{
+			Client: mgr.GetClient(),
+			Scheme: mgr.GetScheme(),
+		}).SetupWithManager(mgr); err != nil {
+			setupLog.Error(err, "unable to create controller", "controller", "SandboxClaim")
+			os.Exit(1)
+		}
+	}
 	//+kubebuilder:scaffold:builder
 
 	if err := mgr.AddHealthzCheck("healthz", healthz.Ping); err != nil {

codegen.go

@@ -19,3 +19,7 @@ package agentsandbox
 // Generate CRDs and RBAC rules
 //go:generate go tool -modfile=tools.mod sigs.k8s.io/controller-tools/cmd/controller-gen rbac:roleName=agent-sandbox-controller,fileName=rbac.generated.yaml crd:maxDescLen=0 paths="./..." output:crd:dir=k8s/crds output:rbac:dir=k8s
 //go:generate go tool -modfile=tools.mod sigs.k8s.io/controller-tools/cmd/controller-gen object crd:maxDescLen=0 paths="./extensions/..." output:crd:dir=k8s/crds output:rbac:dir=k8s rbac:roleName=agent-sandbox-controller,fileName=rbac.generated.yaml
+//go:generate go tool -modfile=tools.mod sigs.k8s.io/controller-tools/cmd/controller-gen object crd:maxDescLen=0 paths=./api/... output:crd:dir=k8s/crds
+//go:generate go tool -modfile=tools.mod sigs.k8s.io/controller-tools/cmd/controller-gen object crd:maxDescLen=0 paths=./extensions/... output:crd:dir=k8s/crds
+//go:generate go tool -modfile=tools.mod sigs.k8s.io/controller-tools/cmd/controller-gen paths=./controllers/... output:rbac:dir=k8s rbac:roleName=agent-sandbox-controller,fileName=rbac.generated.yaml
+//go:generate go tool -modfile=tools.mod sigs.k8s.io/controller-tools/cmd/controller-gen paths=./extensions/controllers/... output:rbac:dir=k8s rbac:roleName=agent-sandbox-controller-extensions,fileName=extensions-rbac.generated.yaml

controllers/sandbox_controller.go

@@ -62,7 +62,6 @@ type SandboxReconciler struct {
 
 //+kubebuilder:rbac:groups=agents.x-k8s.io,resources=sandboxes,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=agents.x-k8s.io,resources=sandboxes/status,verbs=get;update;patch
-
 //+kubebuilder:rbac:groups=core,resources=pods,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=core,resources=services,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=core,resources=persistentvolumeclaims,verbs=get;list;watch;create;update;patch;delete

dev/tools/test-unit

@@ -22,9 +22,17 @@ from shared import utils
 def main():
     """ invokes unit tests and outputs a junit results file """
     repo_root = utils.get_repo_root()
+    # get the list of packages using go list ./...
+    go_list_cmd = ["go", "list", "./..."]
+    go_list_output = subprocess.check_output(go_list_cmd, cwd=repo_root, text=True)
+    packages = go_list_output.strip().split('\n')
+
+    # Filter out the e2e packages
+    filtered_packages = [pkg for pkg in packages if not "test/e2e" in pkg]
+
     result = subprocess.run(utils.go_tool_args(
         "gotestsum", f"--junitfile={repo_root}/bin/unit-junit.xml",
-        "--", "./controllers/...",
+        "--", *filtered_packages
     ), cwd=repo_root)
 
     return result.returncode

extensions/api/v1alpha1/sandboxclaim_types.go

@@ -53,6 +53,17 @@ type SandboxClaimSpec struct {
 
 // SandboxClaimStatus defines the observed state of Sandbox.
 type SandboxClaimStatus struct {
+	// Conditions represent the latest available observations of a Sandbox's current state.
+	// +optional
+	Conditions []metav1.Condition `json:"conditions,omitempty" protobuf:"bytes,1,rep,name=conditions"`
+
+	SandboxStatus SandboxStatus `json:"sandbox,omitempty" protobuf:"bytes,2,opt,name=sandboxStatus"`
+}
+
+type SandboxStatus struct {
+	// SandboxName is the name of the Sandbox created from this claim
+	// +optional
+	Name string `json:"Name,omitempty"`
 }
 
 // +kubebuilder:object:root=true