Add shortname lws for API & sort out build image command (#30)

* Build image based on git hash

Signed-off-by: kerthcet <[email protected]>

* Reduce the resource requests for local testing

Signed-off-by: kerthcet <[email protected]>

* Add short name lws for leaderWorkerSet

Signed-off-by: kerthcet <[email protected]>

---------

Signed-off-by: kerthcet <[email protected]>

Author: kerthcet

.gitignore

@@ -7,6 +7,7 @@
 *.dylib
 bin
 testbin/*
+artifacts
 .DS_Store
 # Test binary, build with `go test -c`
 *.test

Makefile

@@ -1,5 +1,3 @@
-# Image URL to use all building/pushing image targets
-IMG ?= controller:latest
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.28.3
 
@@ -16,6 +14,13 @@ endif
 # tools. (i.e. podman)
 CONTAINER_TOOL ?= docker
 
+GIT_TAG ?= $(shell git describe --tags --dirty --always)
+# Image URL to use all building/pushing image targets
+IMAGE_REGISTRY ?= gcr.io/k8s-staging-lws
+IMAGE_NAME := lws
+IMAGE_REPO := $(IMAGE_REGISTRY)/$(IMAGE_NAME)
+IMG ?= $(IMAGE_REPO):$(GIT_TAG)
+
 # Setting SHELL to bash allows bash commands to be executed by recipes.
 # Options are set to exit when a recipe line exits non-zero or a piped command fails.
 SHELL = /usr/bin/env bash -o pipefail

api/leaderworkerset/v1/leaderworkerset_types.go

@@ -145,9 +145,10 @@ const (
 // +genclient
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
+//+kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.hpaPodSelector
+//+kubebuilder:resource:shortName={lws}
 
 // LeaderWorkerSet is the Schema for the leaderworkersets API
-// +kubebuilder:subresource:scale:specpath=.spec.replicas,statuspath=.status.replicas,selectorpath=.status.hpaPodSelector
 type LeaderWorkerSet struct {
 	metav1.TypeMeta   `json:",inline"`
 	metav1.ObjectMeta `json:"metadata,omitempty"`

artifacts/manifests.yaml

@@ -11,6 +11,8 @@ spec:
     kind: LeaderWorkerSet
     listKind: LeaderWorkerSetList
     plural: leaderworkersets
+    shortNames:
+    - lws
     singular: leaderworkerset
   scope: Namespaced
   versions:

config/crd/bases/leaderworkerset.x-k8s.io_leaderworkersets.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: controller
-  newTag: latest
+  newName: gcr.io/k8s-staging-lws/lws
+  newTag: main

config/manager/kustomization.yaml

@@ -93,7 +93,7 @@ spec:
         # More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/
         resources:
           requests:
-            cpu: 2
-            memory: 2Gi
+            cpu: 1
+            memory: 1Gi
       serviceAccountName: controller-manager
       terminationGracePeriodSeconds: 10