Skip to content

Commit 8cf0580

Browse files
committed
chore(k8s): k8s deprecated api migration
1 parent 27273d6 commit 8cf0580

7 files changed

Lines changed: 16 additions & 88 deletions

File tree

charts/builder/templates/_helpers.tmpl

Lines changed: 0 additions & 12 deletions
This file was deleted.

charts/builder/templates/builder-clusterrole.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{{- if (.Values.global.use_rbac) -}}
2-
{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
32
kind: ClusterRole
4-
apiVersion: {{ template "rbacAPIVersion" . }}
3+
apiVersion: rbac.authorization.k8s.io/v1
54
metadata:
65
name: drycc:drycc-builder
76
labels:
@@ -15,4 +14,3 @@ rules:
1514
resources: ["secrets"]
1615
verbs: ["list","get"]
1716
{{- end -}}
18-
{{- end -}}

charts/builder/templates/builder-clusterrolebinding.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{{- if (.Values.global.use_rbac) -}}
2-
{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
32
kind: ClusterRoleBinding
4-
apiVersion: {{ template "rbacAPIVersion" . }}
3+
apiVersion: rbac.authorization.k8s.io/v1
54
metadata:
65
name: drycc:drycc-builder
76
labels:
@@ -16,4 +15,3 @@ subjects:
1615
name: drycc-builder
1716
namespace: {{ .Release.Namespace }}
1817
{{- end -}}
19-
{{- end -}}

charts/builder/templates/builder-role.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{{- if (.Values.global.use_rbac) -}}
2-
{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
32
kind: Role
4-
apiVersion: {{ template "rbacAPIVersion" . }}
3+
apiVersion: rbac.authorization.k8s.io/v1
54
metadata:
65
name: drycc-builder
76
labels:
@@ -18,4 +17,3 @@ rules:
1817
resources: ["pods/log"]
1918
verbs: ["get"]
2019
{{- end -}}
21-
{{- end -}}

charts/builder/templates/builder-rolebinding.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
{{- if (.Values.global.use_rbac) -}}
2-
{{- if (.Capabilities.APIVersions.Has (include "rbacAPIVersion" .)) -}}
32
kind: RoleBinding
4-
apiVersion: {{ template "rbacAPIVersion" . }}
3+
apiVersion: rbac.authorization.k8s.io/v1
54
metadata:
65
name: drycc-builder
76
labels:
@@ -15,4 +14,3 @@ subjects:
1514
- kind: ServiceAccount
1615
name: drycc-builder
1716
{{- end -}}
18-
{{- end -}}

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ go 1.16
55
require (
66
github.com/arschles/assert v1.0.1-0.20191213221312-71f210f9375a
77
github.com/aws/aws-sdk-go v1.40.15
8-
github.com/urfave/cli v1.22.5
98
github.com/docker/distribution v2.7.1+incompatible
109
github.com/docker/go-metrics v0.0.1 // indirect
11-
github.com/drycc/controller-sdk-go v0.0.0-20210629042308-95dbca4156e7
12-
github.com/drycc/pkg v0.0.0-20200811173146-1f2b2781a852
10+
github.com/drycc/controller-sdk-go v0.0.0-20210805062837-2a7a960603e6
11+
github.com/drycc/pkg v0.0.0-20210805062602-f69851d7b6af
1312
github.com/gorilla/mux v1.8.0 // indirect
1413
github.com/kelseyhightower/envconfig v1.4.0
1514
github.com/pborman/uuid v1.2.1
1615
github.com/sirupsen/logrus v1.8.1 // indirect
17-
golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83
16+
github.com/urfave/cli v1.22.5
17+
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
1818
gopkg.in/yaml.v2 v2.4.0
1919
k8s.io/api v0.22.0
2020
k8s.io/apimachinery v0.22.0

go.sum

Lines changed: 8 additions & 60 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)