Add api and cmd, update Dockerfile/Makefile. Update vendor

Signed-off-by: Jason Cho <[email protected]>

Author: jcho02

.gitignore

@@ -1,6 +1,8 @@
 # But not these files...
 !/.gitignore
 
+bin
+
 !*.go
 !go.sum
 !go.mod

Dockerfile

@@ -7,15 +7,26 @@ ARG CONTROLLER_GEN_VERSION=0.17.1
 ARG CI_LINT_VERSION=1.52.0
 ARG MOQ_VERSION=0.3.4
 
+RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v${CI_LINT_VERSION}     && go install github.com/matryer/moq@v${MOQ_VERSION}     && go install sigs.k8s.io/controller-tools/cmd/controller-gen@v${CONTROLLER_GEN_VERSION}     && go install k8s.io/code-generator/cmd/client-gen@v${CLIENT_GEN_VERSION}     && go install k8s.io/code-generator/cmd/lister-gen@v${LISTER_GEN_VERSION}     && go install k8s.io/code-generator/cmd/informer-gen@v${INFORMER_GEN_VERSION}
+RUN git config --file=/.gitconfig --add safe.directory /work
+
+WORKDIR /build
+COPY . .
+RUN pwd
+RUN ls -l
+
+
+#RUN mkdir /artifacts
+#RUN make PREFIX=/artifacts cmds
+
+FROM registry.access.redhat.com/ubi9/ubi-minimal:9.4
+
 LABEL io.k8s.display-name="IBM Power DRA Driver"
 LABEL name="IBM Power DRA Driver"
 LABEL vendor="IBM"
-LABEL version="1.0.0"
+LABEL version="0.1.0"
 LABEL release="N/A"
 LABEL summary="Automate the management and monitoring of addition of specific Power devices to a Pod."
 LABEL description="Automate the management and monitoring of addition of specific Power devices to a Pod."
 
-RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v${CI_LINT_VERSION}     && go install github.com/matryer/moq@v${MOQ_VERSION}     && go install sigs.k8s.io/controller-tools/cmd/controller-gen@v${CONTROLLER_GEN_VERSION}     && go install k8s.io/code-generator/cmd/client-gen@v${CLIENT_GEN_VERSION}     && go install k8s.io/code-generator/cmd/lister-gen@v${LISTER_GEN_VERSION}     && go install k8s.io/code-generator/cmd/informer-gen@v${INFORMER_GEN_VERSION}
-RUN git config --file=/.gitconfig --add safe.directory /work
-
-COPY --from=build /power-dra-kubeletplugin /usr/bin/power-dra-kubeletplugin
+COPY test-kubeletplugin /usr/bin/power-dra-kubeletplugin

Makefile

@@ -1,7 +1,7 @@
 # This project applies to ppc64le only
 ARCH ?= ppc64le
 
-REGISTRY ?= quay.io/powercloud
+REGISTRY ?= quay.io/jcho0
 REPOSITORY ?= power-dra-driver
 TAG ?= v0.1.0
 
@@ -10,9 +10,19 @@ CONTAINER_RUNTIME ?= $(shell command -v podman 2> /dev/null || echo docker)
 ########################################################################
 # Go Targets
 
-#.PHONY: build
-#build: fmt vet
-#	GOOS=linux GOARCH=$(ARCH) go build -o bin/power-dra-driver cmd/power-dra-driver/main.go
+build: fmt vet
+	GOOS=linux GOARCH=$(ARCH) go build -o bin/power-dra-driver cmd/power-dra-driver/main.go
+
+controller-gen: ## Download controller-gen locally if necessary.
+ifeq (, $(shell which controller-gen))
+	go install sigs.k8s.io/controller-tools/cmd/[email protected]
+CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
+else
+CONTROLLER_GEN=$(shell which controller-gen)
+endif
+
+generate: controller-gen
+	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 .PHONY: fmt
 fmt:
@@ -27,27 +37,29 @@ clean:
 	rm -f ./bin/power-dra-driver
 	rm -rf vendor
 
+CMDS := $(patsubst ./cmd/%/,%,$(sort $(dir $(wildcard ./cmd/*/))))
+CMD_TARGETS := $(patsubst %,cmd-%, $(CMDS))
+
+binaries: cmds
+ifneq ($(PREFIX),)
+cmd-%: COMMAND_BUILD_OPTIONS = -o $(PREFIX)/$(*)
+endif
+cmds: $(CMD_TARGETS)
+$(CMD_TARGETS): cmd-%:
+	CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' \
+		CC=$(CC) CGO_ENABLED=1 GOOS=$(GOOS) GOARCH=$(GOARCH) \
+		go build -ldflags "-s -w -X $(CLI_VERSION_PACKAGE).gitCommit=$(GIT_COMMIT) -X $(CLI_VERSION_PACKAGE).version=$(CLI_VERSION)" $(COMMAND_BUILD_OPTIONS) $(MODULE)/cmd/$(*)
+
 ########################################################################
 # Container Targets
 
-.PHONY: image
-image: build
+.PHONY: image-build
+image-build: image-build
 	$(CONTAINER_RUNTIME) buildx build \
 		-t $(REGISTRY)/$(REPOSITORY):$(TAG) \
 		--platform linux/$(ARCH) -f Dockerfile .
 
-.PHONY: push
-push:
+.PHONY: image-push
+image-push:
 	$(info push Container image...)
 	$(CONTAINER_RUNTIME) push $(REGISTRY)/$(REPOSITORY):$(TAG)
-
-########################################################################
-# Deployment Targets
-
-.PHONY: dep-plugin
-dep-plugin:
-	kustomize build manifests | oc apply -f -
-
-.PHONY: dep-examples
-dep-examples:
-	kustomize build examples | oc apply -f -

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/api.go

@@ -0,0 +1,59 @@
+/*
+Copyright 2025.
+
+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 v1alpha1
+
+import (
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/runtime/serializer/json"
+)
+
+const (
+	GroupName     = "gpu.powervs-openshift-ipi.cis.ibm.net"
+	Version       = "v1alpha1"
+	GpuConfigKind = "GpuConfig"
+)
+
+// Decoder implements a decoder for objects in this API group.
+var Decoder runtime.Decoder
+
+func init() {
+	// Create a new scheme and add our types to it. If at some point in the
+	// future a new version of the configuration API becomes necessary, then
+	// conversion functions can be generated and registered to continue
+	// supporting older versions.
+	scheme := runtime.NewScheme()
+	schemeGroupVersion := schema.GroupVersion{
+		Group:   GroupName,
+		Version: Version,
+	}
+	scheme.AddKnownTypes(schemeGroupVersion,
+		&GpuConfig{},
+	)
+	metav1.AddToGroupVersion(scheme, schemeGroupVersion)
+
+	// Set up a json serializer to decode our types.
+	Decoder = json.NewSerializerWithOptions(
+		json.DefaultMetaFactory,
+		scheme,
+		scheme,
+		json.SerializerOptions{
+			Pretty: true, Strict: true,
+		},
+	)
+}

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/doc.go

@@ -0,0 +1,20 @@
+/*
+Copyright 2025.
+
+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.
+*/
+
+// +k8s:deepcopy-gen=packages
+// +groupName=gpu.powervs-openshift-ipi.cis.ibm.net
+
+package v1alpha1

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/gpuconfig.go

@@ -0,0 +1,80 @@
+/*
+Copyright 2025.
+
+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 v1alpha1
+
+import (
+	"fmt"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
+)
+
+// +genclient
+// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
+
+// GpuConfig holds the set of parameters for configuring a GPU.
+type GpuConfig struct {
+	metav1.TypeMeta `json:",inline"`
+	Sharing         *GpuSharing `json:"sharing,omitempty"`
+}
+
+// DefaultGpuConfig provides the default GPU configuration.
+func DefaultGpuConfig() *GpuConfig {
+	return &GpuConfig{
+		TypeMeta: metav1.TypeMeta{
+			APIVersion: GroupName + "/" + Version,
+			Kind:       GpuConfigKind,
+		},
+		Sharing: &GpuSharing{
+			Strategy: TimeSlicingStrategy,
+			TimeSlicingConfig: &TimeSlicingConfig{
+				Interval: ptr.To(DefaultTimeSlice),
+			},
+		},
+	}
+}
+
+// Normalize updates a GpuConfig config with implied default values based on other settings.
+func (c *GpuConfig) Normalize() error {
+	if c == nil {
+		return fmt.Errorf("config is 'nil'")
+	}
+	if c.Sharing == nil {
+		c.Sharing = &GpuSharing{
+			Strategy: TimeSlicingStrategy,
+		}
+	}
+	if c.Sharing.Strategy == TimeSlicingStrategy && c.Sharing.TimeSlicingConfig == nil {
+		c.Sharing.TimeSlicingConfig = &TimeSlicingConfig{
+			Interval: "Default",
+		}
+	}
+	if c.Sharing.Strategy == SpacePartitioningStrategy && c.Sharing.SpacePartitioningConfig == nil {
+		c.Sharing.SpacePartitioningConfig = &SpacePartitioningConfig{
+			PartitionCount: 1,
+		}
+	}
+	return nil
+}
+
+// Validate ensures that GpuConfig has a valid set of values.
+func (c *GpuConfig) Validate() error {
+	if c.Sharing == nil {
+		return fmt.Errorf("no sharing strategy set")
+	}
+	return c.Sharing.Validate()
+}

api/powervs-openshift-ipi.cis.ibm.net/resource/gpu/v1alpha1/sharing.go

@@ -0,0 +1,107 @@
+/*
+Copyright 2025.
+
+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 v1alpha1
+
+import (
+	"fmt"
+)
+
+// These constants represent the different Sharing strategies.
+const (
+	TimeSlicingStrategy       GpuSharingStrategy = "TimeSlicing"
+	SpacePartitioningStrategy GpuSharingStrategy = "SpacePartitioning"
+)
+
+// These constants represent the different TimeSlicing configurations.
+const (
+	DefaultTimeSlice TimeSliceInterval = "Default"
+	ShortTimeSlice   TimeSliceInterval = "Short"
+	MediumTimeSlice  TimeSliceInterval = "Medium"
+	LongTimeSlice    TimeSliceInterval = "Long"
+)
+
+// GpuSharingStrategy defines the valid Sharing strategies as a string.
+type GpuSharingStrategy string
+
+// TimeSliceInterval defines the valid timeslice interval as a string.
+type TimeSliceInterval string
+
+// GpuSharing holds the current sharing strategy for GPUs and its settings.
+// If DeviceClass and ResourceClaim set this, then the strategy from the claim
+// is used. If multiple configurations set this, then the last one is used.
+type GpuSharing struct {
+	Strategy                GpuSharingStrategy       `json:"strategy"`
+	TimeSlicingConfig       *TimeSlicingConfig       `json:"timeSlicingConfig,omitempty"`
+	SpacePartitioningConfig *SpacePartitioningConfig `json:"spacePartitioningConfig,omitempty"`
+}
+
+// TimeSlicingSettings provides the settings for the TimeSlicing strategy.
+type TimeSlicingConfig struct {
+	Interval TimeSliceInterval `json:"interval,omitempty"`
+}
+
+// SpacePartitioningConfig provides the configuring for the SpacePartitioning strategy.
+type SpacePartitioningConfig struct {
+	// SliceCount indicates how many equally sized (memory and compute) slices
+	// the GPU should be divided into. Each client that attaches will get
+	// access to exactly one of these slices.
+	PartitionCount int `json:"partitionCount,omitempty"`
+}
+
+// IsTimeSlicing checks if the TimeSlicing strategy is applied.
+func (s *GpuSharing) IsTimeSlicing() bool {
+	if s == nil {
+		return false
+	}
+	return s.Strategy == TimeSlicingStrategy
+}
+
+// IsSpacePartitioning checks if the SpacePartitioning strategy is applied.
+func (s *GpuSharing) IsSpacePartitioning() bool {
+	if s == nil {
+		return false
+	}
+	return s.Strategy == SpacePartitioningStrategy
+}
+
+// GetTimeSlicingConfig returns the timeslicing config that applies to the given strategy.
+func (s *GpuSharing) GetTimeSlicingConfig() (*TimeSlicingConfig, error) {
+	if s == nil {
+		return nil, fmt.Errorf("no sharing set to get config from")
+	}
+	if s.Strategy != TimeSlicingStrategy {
+		return nil, fmt.Errorf("strategy is not set to '%v'", TimeSlicingStrategy)
+	}
+	if s.SpacePartitioningConfig != nil {
+		return nil, fmt.Errorf("cannot use SpacePartitioningConfig with the '%v' strategy", TimeSlicingStrategy)
+	}
+	return s.TimeSlicingConfig, nil
+}
+
+// GetSpacePartitioningConfig returns the SpacePartitioning config that applies to the given strategy.
+func (s *GpuSharing) GetSpacePartitioningConfig() (*SpacePartitioningConfig, error) {
+	if s == nil {
+		return nil, fmt.Errorf("no sharing set to get config from")
+	}
+	if s.Strategy != SpacePartitioningStrategy {
+		return nil, fmt.Errorf("strategy is not set to '%v'", SpacePartitioningStrategy)
+	}
+	if s.TimeSlicingConfig != nil {
+		return nil, fmt.Errorf("cannot use TimeSlicingConfig with the '%v' strategy", SpacePartitioningStrategy)
+	}
+	return s.SpacePartitioningConfig, nil
+}