Skip to content

Commit

Permalink
fix: ensure all references to k8s upgrade are complete
Browse files Browse the repository at this point in the history
  • Loading branch information
iwalmsley committed Aug 10, 2023
1 parent 8dbfab8 commit f730645
Show file tree
Hide file tree
Showing 13 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion architecture/add/05-architecture-security.md
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ below shows the path a request takes through the system when the Kubernetes `Ing
is annotated with the following authorisation annotations

```
apiVersion: extensions/v1beta1
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
name: svcName
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: vault-deployment
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ quote $.Values.elasticName }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
name: {{ quote $.Values.fluentdServiceAccount }}
namespace: {{ quote $.Values.namespace }}
---
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
name: {{ quote $.Values.fluentdServiceAccount }}
Expand All @@ -18,7 +18,7 @@ subjects:
namespace: {{ quote $.Values.namespace }}
---
kind: ClusterRole
apiVersion: rbac.authorization.k8s.io/v1beta1
apiVersion: rbac.authorization.k8s.io/v1
metadata:
name: {{ quote $.Values.fluentdServiceAccount }}
rules:
Expand All @@ -31,7 +31,7 @@ rules:
- watch
- list
---
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: DaemonSet
metadata:
name: fluentd
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ quote $.Values.kibanaName }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ use it from within the heketi pod:
For dynamic provisioning, create a StorageClass similar to this:
---
apiVersion: storage.k8s.io/v1beta1
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: glusterfs-storage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
targetPort: 8080
---
kind: Deployment
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: deploy-heketi
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
kind: StorageClass
apiVersion: storage.k8s.io/v1beta1
apiVersion: storage.k8s.io/v1
metadata:
name: ${STORAGE_CLASS}
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ items:
status:
loadBalancer: {}
- kind: Deployment
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: gluster-s3-deployment
labels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ spec:
targetPort: 8080
---
kind: Deployment
apiVersion: extensions/v1beta1
apiVersion: apps/v1
metadata:
name: heketi
labels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
apiVersion: storage.k8s.io/v1beta1
apiVersion: storage.k8s.io/v1
kind: StorageClass
metadata:
name: glusterfs-storage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,6 @@ function createScale(specReplicas, statusReplicas) {
}

function createManifest() {
return 'apiVersion: extensions/v1beta1\n'
return 'apiVersion: apps/v1\n'
+ 'kind: Deployment';
}
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,6 @@ function createIngress() {
}

function createManifest() {
return 'apiVersion: extensions/v1beta1\n'
return 'apiVersion: apps/v1\n'
+ 'kind: Ingress';
}

0 comments on commit f730645

Please sign in to comment.