Fix/functional test (#383)

* updating to python3-pip * updating make install to use go install instead of go get * checkout fix/functional-test not master * Updated to checkout@v3 * Update Python Action & Py version * Changing back to master branch --------- Co-authored-by: Alfredo Garo <[email protected]>
keikoproj · Apr 14, 2023 · 6698ae3 · 6698ae3
1 parent 582c570
commit 6698ae3
Show file tree

Hide file tree

Showing 5 changed files with 172 additions and 14 deletions.
diff --git a/.github/workflows/functional-test.yaml b/.github/workflows/functional-test.yaml
@@ -16,15 +16,15 @@ jobs:
     steps:
 
       - name: python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
-          python-version: '3.6'
+          python-version: 'pypy3.9'
           architecture: 'x64'
 
       - name: setup
         run: |
           sudo apt update
-          sudo apt install python-pip
+          sudo apt install python3-pip
           pip install --user awscli
           curl -LO https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
           chmod +x ./kubectl
@@ -36,7 +36,7 @@ jobs:
           aws --version
 
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: master
 

diff --git a/Makefile b/Makefile
@@ -124,7 +124,7 @@ controller-gen: controller-gen-find check-controller-gen
 .PHONY: controller-gen-real
 controller-gen-find:
 ifeq (, $(shell which controller-gen))
-	go get sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION)
+	go install sigs.k8s.io/controller-tools/cmd/controller-gen@$(CONTROLLER_GEN_VERSION)
 CONTROLLER_GEN=$(shell go env GOPATH)/bin/controller-gen
 else
 CONTROLLER_GEN=$(shell which controller-gen)

diff --git a/config/crd/bases/instancemgr.keikoproj.io_instancegroups.yaml b/config/crd/bases/instancemgr.keikoproj.io_instancegroups.yaml
@@ -57,10 +57,14 @@ spec:
         description: InstanceGroup is the Schema for the instancegroups API
         properties:
           apiVersion:
-            description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
+            description: 'APIVersion defines the versioned schema of this representation
+              of an object. Servers should convert recognized schemas to the latest
+              internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
             type: string
           kind:
-            description: 'Kind is a string value representing the REST resource this object represents. Servers may infer this from the endpoint the client submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
+            description: 'Kind is a string value representing the REST resource this
+              object represents. Servers may infer this from the endpoint the client
+              submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
             type: string
           metadata:
             type: object
@@ -203,20 +207,27 @@ spec:
                         type: array
                       taints:
                         items:
-                          description: The node this Taint is attached to has the "effect" on any pod that does not tolerate the Taint.
+                          description: The node this Taint is attached to has the
+                            "effect" on any pod that does not tolerate the Taint.
                           properties:
                             effect:
-                              description: Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
+                              description: Required. The effect of the taint on pods
+                                that do not tolerate the taint. Valid effects are
+                                NoSchedule, PreferNoSchedule and NoExecute.
                               type: string
                             key:
-                              description: Required. The taint key to be applied to a node.
+                              description: Required. The taint key to be applied to
+                                a node.
                               type: string
                             timeAdded:
-                              description: TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.
+                              description: TimeAdded represents the time at which
+                                the taint was added. It is only written for NoExecute
+                                taints.
                               format: date-time
                               type: string
                             value:
-                              description: The taint value corresponding to the taint key.
+                              description: The taint value corresponding to the taint
+                                key.
                               type: string
                           required:
                           - effect
@@ -382,7 +393,8 @@ spec:
               provisioner:
                 type: string
               strategy:
-                description: AwsUpgradeStrategy defines the upgrade strategy of an AWS Instance Group
+                description: AwsUpgradeStrategy defines the upgrade strategy of an
+                  AWS Instance Group
                 properties:
                   crd:
                     properties:
@@ -424,7 +436,8 @@ spec:
                 type: string
               conditions:
                 items:
-                  description: InstanceGroupConditions describes the conditions of the InstanceGroup
+                  description: InstanceGroupConditions describes the conditions of
+                    the InstanceGroup
                   properties:
                     status:
                       type: string

diff --git a/go.mod b/go.mod
@@ -27,8 +27,10 @@ require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fatih/color v1.7.0 // indirect
 	github.com/fsnotify/fsnotify v1.4.9 // indirect
 	github.com/go-logr/zapr v0.4.0 // indirect
+	github.com/gobuffalo/flect v0.2.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect
 	github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
@@ -39,25 +41,31 @@ require (
 	github.com/googleapis/gnostic v0.5.5 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/inconshreveable/mousetrap v1.0.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/karlseguin/ccache/v2 v2.0.8 // indirect
+	github.com/mattn/go-colorable v0.1.2 // indirect
+	github.com/mattn/go-isatty v0.0.8 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
 	github.com/prometheus/common v0.26.0 // indirect
 	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/spf13/cobra v1.1.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	go.uber.org/zap v1.19.0 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
 	golang.org/x/net v0.7.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect
 	golang.org/x/term v0.5.0 // indirect
 	golang.org/x/text v0.7.0 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	golang.org/x/tools v0.1.12 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/protobuf v1.26.0 // indirect
@@ -69,6 +77,7 @@ require (
 	k8s.io/klog/v2 v2.8.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7 // indirect
 	k8s.io/utils v0.0.0-20210802155522-efc7438f0176 // indirect
+	sigs.k8s.io/controller-tools v0.4.1 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect
 	sigs.k8s.io/yaml v1.2.0 // indirect
 )