Skip to content
This repository has been archived by the owner on Oct 30, 2024. It is now read-only.

Commit

Permalink
🐛 bump KinD k8s node image version to 1.20 (#426)
Browse files Browse the repository at this point in the history
Co-authored-by: Dani Santos <daniele.santos@shopify.com>
  • Loading branch information
jerr and dani-santos-code authored Jun 6, 2022
1 parent 7ebb9a6 commit 29fbf35
Show file tree
Hide file tree
Showing 22 changed files with 19 additions and 228 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ test:
./test.sh

test-setup:
kind create cluster --name ${TEST_CLUSTER_NAME} --image kindest/node:v1.15.0
kind create cluster --name ${TEST_CLUSTER_NAME} --image kindest/node:v1.20.15@sha256:6f2d011dffe182bad80b85f6c00e8ca9d86b5b8922cdf433d53575c4c5212248

test-teardown:
kind delete cluster --name ${TEST_CLUSTER_NAME}
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
[![Go Report Card](https://goreportcard.com/badge/github.com/Shopify/kubeaudit)](https://goreportcard.com/report/github.com/Shopify/kubeaudit)
[![GoDoc](https://godoc.org/github.com/Shopify/kubeaudit?status.png)](https://godoc.org/github.com/Shopify/kubeaudit)

> Kubeaudit can now be used as both a command line tool (CLI) and as a Go package!
> Kubeaudit no longer supports APIs deprecated as of [Kubernetes v.1.16 release](https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/). So, it is now a requirement for clusters to run Kubernetes >=1.16

# kubeaudit :cloud: :lock: :muscle:

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
2 changes: 1 addition & 1 deletion auditors/capabilities/fixtures/capabilities-added.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
2 changes: 1 addition & 1 deletion auditors/capabilities/fixtures/capabilities-nil.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
6 changes: 3 additions & 3 deletions docs/auditors/capabilities.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ $ kubeaudit capabilities -f "auditors/capabilities/fixtures/capabilities-nil.yml

---------------- Results for ---------------

apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down Expand Up @@ -54,7 +54,7 @@ auditors:
`manifest.yaml`

```yaml
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand All @@ -80,7 +80,7 @@ $ kubeaudit all --kconfig "config.yaml" -f "manifest.yaml"
---------------- Results for ---------------
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
2 changes: 1 addition & 1 deletion docs/auditors/mounts.md
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ auditors:
`manifest.yaml`

```yaml
apiVersion: apps/v1beta2
apiVersion: apps/v1
kind: Deployment
metadata:
name: deployment
Expand Down
8 changes: 0 additions & 8 deletions internal/k8sinternal/scheme.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ import (
certmanagerv1alpha2 "github.com/jetstack/cert-manager/pkg/apis/certmanager/v1alpha2"
admissionregistrationv1beta1 "k8s.io/api/admissionregistration/v1beta1"
appsv1 "k8s.io/api/apps/v1"
appsv1beta1 "k8s.io/api/apps/v1beta1"
appsv1beta2 "k8s.io/api/apps/v1beta2"
authenticationv1 "k8s.io/api/authentication/v1"
authenticationv1beta1 "k8s.io/api/authentication/v1beta1"
authorizationv1 "k8s.io/api/authorization/v1"
Expand All @@ -20,7 +18,6 @@ import (
coordinationv1beta1 "k8s.io/api/coordination/v1beta1"
corev1 "k8s.io/api/core/v1"
eventsv1beta1 "k8s.io/api/events/v1beta1"
extensionsv1beta1 "k8s.io/api/extensions/v1beta1"
networkingv1 "k8s.io/api/networking/v1"
networkingv1beta1 "k8s.io/api/networking/v1beta1"
nodev1alpha1 "k8s.io/api/node/v1alpha1"
Expand All @@ -35,7 +32,6 @@ import (
storagev1 "k8s.io/api/storage/v1"
storagev1alpha1 "k8s.io/api/storage/v1alpha1"
storagev1beta1 "k8s.io/api/storage/v1beta1"
extapi "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
runtime "k8s.io/apimachinery/pkg/runtime"
schema "k8s.io/apimachinery/pkg/runtime/schema"
Expand All @@ -49,8 +45,6 @@ var localSchemeBuilder = runtime.SchemeBuilder{
admissionregistrationv1beta1.AddToScheme,
certmanagerv1alpha2.AddToScheme,
appsv1.AddToScheme,
appsv1beta1.AddToScheme,
appsv1beta2.AddToScheme,
authenticationv1.AddToScheme,
authenticationv1beta1.AddToScheme,
authorizationv1.AddToScheme,
Expand All @@ -65,8 +59,6 @@ var localSchemeBuilder = runtime.SchemeBuilder{
coordinationv1.AddToScheme,
corev1.AddToScheme,
eventsv1beta1.AddToScheme,
extapi.AddToScheme,
extensionsv1beta1.AddToScheme,
networkingv1.AddToScheme,
networkingv1beta1.AddToScheme,
nodev1alpha1.AddToScheme,
Expand Down
26 changes: 0 additions & 26 deletions internal/test/fixtures/all_resources/daemonset-v1beta1.yml

This file was deleted.

26 changes: 0 additions & 26 deletions internal/test/fixtures/all_resources/daemonset-v1beta2.yml

This file was deleted.

26 changes: 0 additions & 26 deletions internal/test/fixtures/all_resources/deployment-apps-v1beta1.yml

This file was deleted.

26 changes: 0 additions & 26 deletions internal/test/fixtures/all_resources/deployment-apps-v1beta2.yml

This file was deleted.

This file was deleted.

27 changes: 0 additions & 27 deletions internal/test/fixtures/all_resources/statefulset-v1beta1.yml

This file was deleted.

24 changes: 0 additions & 24 deletions pkg/k8s/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,8 @@ func GetObjectMeta(resource Resource) *ObjectMetaV1 {
return &kubeType.ObjectMeta
case *DaemonSetV1:
return &kubeType.ObjectMeta
case *DaemonSetV1Beta1:
return &kubeType.ObjectMeta
case *DaemonSetV1Beta2:
return &kubeType.ObjectMeta
case *DeploymentExtensionsV1Beta1:
return &kubeType.ObjectMeta
case *DeploymentV1:
return &kubeType.ObjectMeta
case *DeploymentV1Beta1:
return &kubeType.ObjectMeta
case *DeploymentV1Beta2:
return &kubeType.ObjectMeta
case *JobV1:
return &kubeType.ObjectMeta
case *PodTemplateV1:
Expand All @@ -90,8 +80,6 @@ func GetObjectMeta(resource Resource) *ObjectMetaV1 {
return &kubeType.ObjectMeta
case *StatefulSetV1:
return &kubeType.ObjectMeta
case *StatefulSetV1Beta1:
return &kubeType.ObjectMeta
case *PodV1:
return &kubeType.ObjectMeta
case *NamespaceV1:
Expand Down Expand Up @@ -144,18 +132,8 @@ func GetPodTemplateSpec(resource Resource) *PodTemplateSpecV1 {
return &kubeType.Spec.JobTemplate.Spec.Template
case *DaemonSetV1:
return &kubeType.Spec.Template
case *DaemonSetV1Beta1:
return &kubeType.Spec.Template
case *DaemonSetV1Beta2:
return &kubeType.Spec.Template
case *DeploymentExtensionsV1Beta1:
return &kubeType.Spec.Template
case *DeploymentV1:
return &kubeType.Spec.Template
case *DeploymentV1Beta1:
return &kubeType.Spec.Template
case *DeploymentV1Beta2:
return &kubeType.Spec.Template
case *JobV1:
return &kubeType.Spec.Template
case *PodTemplateV1:
Expand All @@ -164,8 +142,6 @@ func GetPodTemplateSpec(resource Resource) *PodTemplateSpecV1 {
return kubeType.Spec.Template
case *StatefulSetV1:
return &kubeType.Spec.Template
case *StatefulSetV1Beta1:
return &kubeType.Spec.Template
case *PodV1, *NamespaceV1:
return nil
}
Expand Down
Loading

0 comments on commit 29fbf35

Please sign in to comment.