Merge pull request #118 from dmatch01/quota-management-go-mod-adds-and-deletes

Quota management go mod adds and deletes

Author: dmatch01

.gitignore

@@ -109,7 +109,9 @@ kubernetes.tar.gz
 
 # generated files in any directory
 # TODO(thockin): uncomment this when we stop committing the generated files.
-zz_generated.*
+
+#zz_generated.*
+
 #zz_generated.openapi.go
 
 # make-related metadata

.travis.yml

@@ -9,7 +9,7 @@ services:
  - docker
 
 go:
- - "1.15.11"
+ - "1.16.3"
 
 go_import_path: github.com/IBM/multi-cluster-app-dispatcher
 

CONTROLLER_VERSION

@@ -1 +1 @@
-1.29.11
+1.29.12

cmd/deepcopy-gen/main.go

@@ -48,20 +48,22 @@ limitations under the License.
 package main
 
 import (
+"path/filepath"
+
 "k8s.io/gengo/args"
 "k8s.io/gengo/examples/deepcopy-gen/generators"
-"path/filepath"
 
-"github.com/golang/glog"
 "github.com/spf13/pflag"
+"k8s.io/klog/v2"
 )
 
 func main() {
+klog.InitFlags(nil)
 arguments := args.Default()
 
 // Override defaults.
 arguments.OutputFileBaseName = "deepcopy_generated"
-current_loc, _:= filepath.Abs(".")
+current_loc, _ := filepath.Abs(".")
 arguments.GoHeaderFilePath = filepath.Join(current_loc, "hack/boilerplate/boilerplate.go.txt")
 
 // Custom args.
@@ -76,7 +78,7 @@ func main() {
 generators.DefaultNameSystem(),
 generators.Packages,
 ); err != nil {
-glog.Fatalf("Error: %v", err)
+klog.Fatalf("Error: %v", err)
 }
-glog.V(2).Info("Completed successfully.")
+klog.V(2).Info("Completed successfully.")
 }

cmd/kar-controllers/app/options/options.go

@@ -17,7 +17,7 @@ limitations under the License.
 package options
 
 import (
-"github.com/golang/glog"
+"k8s.io/klog"
 "github.com/spf13/pflag"
 "os"
 "strconv"
@@ -63,7 +63,7 @@ func (s *ServerOption) AddFlags(fs *pflag.FlagSet) {
 fs.IntVar(&s.HeadOfLineHoldingTime,"headoflineholdingtime", s.HeadOfLineHoldingTime,"Number of seconds a job can stay at the Head Of Line without being bumped. Default is 0.")
 fs.StringVar(&s.QuotaRestURL,"quotaURL", s.QuotaRestURL,"URL for ReST quota management. Default is none.")
 //	fs.IntVar(&s.SecurePort, "secure-port", 6443, "The port on which to serve secured, uthenticated access for metrics.")
-glog.V(4).Infof("[AddFlags] Controller configuration: %+v", s)
+klog.V(4).Infof("[AddFlags] Controller configuration: %+v", s)
 
 }
 

cmd/kar-controllers/main.go

@@ -17,19 +17,19 @@ package main
 
 import (
 "fmt"
+
 "github.com/IBM/multi-cluster-app-dispatcher/cmd/kar-controllers/app"
 "github.com/IBM/multi-cluster-app-dispatcher/cmd/kar-controllers/app/options"
 "github.com/spf13/pflag"
-"k8s.io/apiserver/pkg/util/flag"
+
 "os"
 )
 
-
 func main() {
 s := options.NewServerOption()
 s.AddFlags(pflag.CommandLine)
 
-flag.InitFlags()
+//flag.InitFlags()
 s.CheckOptionOrDie()
 
 if err := app.Run(s); err != nil {

deployment/build.sh

@@ -4,6 +4,6 @@ set -x
 project_root=$(cd ..; pwd)
 git_path=github.com/IBM/multi-cluster-app-dispatcher
 
-container_id=$(docker run --rm -v "$project_root":/go/src/$git_path -d -w /go/src/$git_path/deployment golang:1.15.11-alpine3.13 ./build-inside-container.sh)
+container_id=$(docker run --rm -v "$project_root":/go/src/$git_path -d -w /go/src/$git_path/deployment golang:1.16.3-alpine3.13 ./build-inside-container.sh)
 
 docker logs -f $container_id

deployment/mcad-controller/templates/deployment.yaml

@@ -32,6 +32,7 @@ spec:
  nodePort: 30082
 #{{ end }}
 ---
+#{{ if .Values.configMap.multiCluster }}
 apiVersion: apiregistration.k8s.io/v1beta1
 kind: APIService
 metadata:
@@ -59,6 +60,7 @@ spec:
  insecureSkipTLSVerify: true
  groupPriorityMinimum: 100
  versionPriority: 100
+ #{{ end }} 
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole

deployment/mcad-controller/values.yaml

@@ -1,7 +1,7 @@
 # Default values for MCAD-Controller.
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
-deploymentName: xqueuejob-controller
+deploymentName: mcad-controller
 namespace: kube-system
 replicaCount: 1
 loglevel: 4
@@ -34,14 +34,15 @@ imagePullSecret:
  registry: registry.stage1.ng.bluemix.net
  password: dummyvalue
 
-serviceAccount: xqueuejob-controller
+serviceAccount: mcad-controller
 
 nodeSelector:
  hostname:
 
 configMap:
  name:
- dispatcherMode: '"false"'
+ multiCluster: false
+ dispatcherMode: "false"
  agentConfigs:
  quoteRestUrl:
 
@@ -51,4 +52,4 @@ volumes:
 quotaManagement:
  rbac:
  apiGroup:
- resource:
+ resource:

doc/usage/examples/aw-1-k8s-job1.yaml

@@ -0,0 +1,38 @@
+apiVersion: mcad.ibm.com/v1alpha1
+kind: AppWrapper
+metadata:
+ name: aw-generic-statefulset-2
+ namespace: test1
+spec:
+ schedulingSpec:
+ minAvailable: 2
+ resources:
+ GenericItems:
+ replicas: 1
+ metadata:
+ name: aw-generic-statefulset-2
+ namespace: test1
+ generictemplate:
+ apiVersion: apps/v1
+ kind: StatefulSet
+ metadata:
+ name: aw-generic-statefulset-2
+ namespace: test1
+ labels:
+ app: aw-generic-statefulset-2
+ spec:
+ replicas: 2
+ selector:
+ matchLabels:
+ app: aw-generic-statefulset-2
+ template:
+ metadata:
+ labels:
+ app: aw-generic-statefulset-2
+ spec:
+ containers:
+ - name: aw-generic-statefulset-2
+ image: k8s.gcr.io/echoserver:1.4
+ imagePullPolicy: Never
+ ports:
+ - containerPort: 80