Updates helm to 3.6.3 (#123)

* updates helm dep to 3.6.3 and all other things that depend on that version * put cancelfunc on context in setup
theketchio · Aug 10, 2021 · 29be584 · 29be584
1 parent 95dbbbf
commit 29be584
Show file tree

Hide file tree

Showing 15 changed files with 367 additions and 55 deletions.
diff --git a/cmd/ketch/app_deploy_test.go b/cmd/ketch/app_deploy_test.go
@@ -4,11 +4,12 @@ import (
 	"bytes"
 	"context"
 	"io/ioutil"
-	"k8s.io/apimachinery/pkg/api/errors"
 	"os"
 	"path"
 	"testing"
 
+	"k8s.io/apimachinery/pkg/api/errors"
+
 	registryv1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/stretchr/testify/require"
 	v1 "k8s.io/api/apps/v1"
@@ -60,7 +61,7 @@ func newMockClient() *mockClient {
 	}
 }
 
-func (m *mockClient) Get(_ context.Context, _ client.ObjectKey, obj runtime.Object) error {
+func (m *mockClient) Get(_ context.Context, _ client.ObjectKey, obj client.Object) error {
 	m.getCounter++
 
 	if f, ok := m.get[m.getCounter]; ok {
@@ -78,7 +79,7 @@ func (m *mockClient) Get(_ context.Context, _ client.ObjectKey, obj runtime.Obje
 	panic("unhandled type")
 }
 
-func (m *mockClient) Create(_ context.Context, obj runtime.Object, _ ...client.CreateOption) error {
+func (m *mockClient) Create(_ context.Context, obj client.Object, _ ...client.CreateOption) error {
 	m.createCounter++
 
 	if f, ok := m.create[m.createCounter]; ok {
@@ -96,7 +97,7 @@ func (m *mockClient) Create(_ context.Context, obj runtime.Object, _ ...client.C
 	panic("unhandled type")
 }
 
-func (m *mockClient) Update(ctx context.Context, obj runtime.Object, opts ...client.UpdateOption) error {
+func (m *mockClient) Update(ctx context.Context, obj client.Object, opts ...client.UpdateOption) error {
 	m.updateCounter++
 
 	if f, ok := m.update[m.updateCounter]; ok {

diff --git a/cmd/ketch/framework_update_test.go b/cmd/ketch/framework_update_test.go
@@ -303,7 +303,8 @@ func TestUpdateFrameworkFromYaml(t *testing.T) {
 	frontendFramework := &ketchv1.Framework{
 		TypeMeta: metav1.TypeMeta{},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "frontend-framework",
+			Name:            "frontend-framework",
+			ResourceVersion: "1",
 		},
 		Spec: ketchv1.FrameworkSpec{
 			NamespaceName: "frontend",
@@ -339,7 +340,8 @@ ingressController:
  className: default-classname`,
 			framework: &ketchv1.Framework{
 				ObjectMeta: metav1.ObjectMeta{
-					Name: "frontend-framework",
+					Name:            "frontend-framework",
+					ResourceVersion: "1",
 				},
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Framework",
@@ -368,7 +370,8 @@ ingressController:
 			yamlData: `name: frontend-framework`,
 			framework: &ketchv1.Framework{
 				ObjectMeta: metav1.ObjectMeta{
-					Name: "frontend-framework",
+					Name:            "frontend-framework",
+					ResourceVersion: "1",
 				},
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Framework",
@@ -409,7 +412,8 @@ func TestUpdateFrameworkFromArgs(t *testing.T) {
 	frontendFramework := &ketchv1.Framework{
 		TypeMeta: metav1.TypeMeta{},
 		ObjectMeta: metav1.ObjectMeta{
-			Name: "frontend-framework",
+			Name:            "frontend-framework",
+			ResourceVersion: "1",
 		},
 		Spec: ketchv1.FrameworkSpec{
 			NamespaceName: "frontend",
@@ -450,7 +454,8 @@ func TestUpdateFrameworkFromArgs(t *testing.T) {
 			},
 			framework: &ketchv1.Framework{
 				ObjectMeta: metav1.ObjectMeta{
-					Name: "frontend-framework",
+					Name:            "frontend-framework",
+					ResourceVersion: "1",
 				},
 				TypeMeta: metav1.TypeMeta{
 					Kind:       "Framework",

diff --git a/config/crd/bases/theketch.io_apps.yaml b/config/crd/bases/theketch.io_apps.yaml
@@ -393,6 +393,31 @@ spec:
                                     to the container.
                                   type: string
                               type: object
+                            seccompProfile:
+                              description: The seccomp options to use by this container.
+                                If seccomp options are provided at both the pod &
+                                container level, the container options override the
+                                pod options.
+                              properties:
+                                localhostProfile:
+                                  description: localhostProfile indicates a profile
+                                    defined in a file on the node should be used.
+                                    The profile must be preconfigured on the node
+                                    to work. Must be a descending path, relative to
+                                    the kubelet's configured seccomp profile location.
+                                    Must only be set if type is "Localhost".
+                                  type: string
+                                type:
+                                  description: "type indicates which kind of seccomp
+                                    profile will be applied. Valid options are: \n
+                                    Localhost - a profile defined in a file on the
+                                    node should be used. RuntimeDefault - the container
+                                    runtime default profile should be used. Unconfined
+                                    - no profile should be applied."
+                                  type: string
+                              required:
+                              - type
+                              type: object
                             windowsOptions:
                               description: The Windows specific settings applied to
                                 all containers. If unspecified, the options from the

diff --git a/go.mod b/go.mod
@@ -3,27 +3,32 @@ module github.com/shipa-corp/ketch
 go 1.16
 
 require (
-	bou.ke/monkey v1.0.2
+	bou.ke/monkey v1.0.2 // indirect
 	github.com/BurntSushi/toml v0.3.1
 	github.com/buildpacks/pack v0.15.1
-	github.com/go-logr/logr v0.1.0
-	github.com/google/go-cmp v0.5.2
+	github.com/go-logr/logr v0.4.0
+	github.com/golangplus/bytes v0.0.0-20160111154220-45c989fe5450 // indirect
+	github.com/golangplus/fmt v0.0.0-20150411045040-2a5d6d7d2995 // indirect
+	github.com/google/go-cmp v0.5.5
 	github.com/google/go-containerregistry v0.1.4
 	github.com/mattn/go-runewidth v0.0.7 // indirect
 	github.com/pkg/errors v0.9.1
-	github.com/spf13/cobra v1.1.1
+	github.com/spf13/cobra v1.1.3
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.6.1
+	github.com/stretchr/testify v1.7.0
 	github.com/thediveo/enumflag v0.10.1
+	github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
 	gopkg.in/src-d/go-git.v4 v4.13.1
 	gotest.tools v2.2.0+incompatible
-	helm.sh/helm/v3 v3.3.1
-	k8s.io/api v0.18.8
-	k8s.io/apimachinery v0.18.8
-	k8s.io/cli-runtime v0.18.8
-	k8s.io/client-go v0.18.8
-	k8s.io/kubectl v0.18.8
+	helm.sh/helm/v3 v3.6.3
+	k8s.io/api v0.21.3
+	k8s.io/apimachinery v0.21.3
+	k8s.io/cli-runtime v0.21.0
+	k8s.io/client-go v0.21.3
+	k8s.io/kubectl v0.21.0
 	rsc.io/letsencrypt v0.0.3 // indirect
-	sigs.k8s.io/controller-runtime v0.6.3
+	sigs.k8s.io/controller-runtime v0.9.5
+	sigs.k8s.io/kustomize v2.0.3+incompatible // indirect
 	sigs.k8s.io/yaml v1.2.0
+	vbom.ml/util v0.0.0-20160121211510-db5cfe13f5cc // indirect
 )