diff --git a/10-4-rs-queue.yaml b/10-4-rs-queue.yaml index d8c06f5..b7aba1c 100644 --- a/10-4-rs-queue.yaml +++ b/10-4-rs-queue.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: ReplicaSet metadata: labels: @@ -8,6 +8,9 @@ metadata: name: queue spec: replicas: 1 + selector: + matchLabels: + component: queue template: metadata: labels: diff --git a/13-10-mongo-simple.yaml b/13-10-mongo-simple.yaml index 0e50b65..aedd59c 100644 --- a/13-10-mongo-simple.yaml +++ b/13-10-mongo-simple.yaml @@ -1,14 +1,17 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: StatefulSet metadata: name: mongo spec: serviceName: "mongo" replicas: 3 + selector: + matchLabels: + name: mongo template: metadata: labels: - app: mongo + name: mongo spec: containers: - name: mongodb diff --git a/13-13-mongo.yaml b/13-13-mongo.yaml index 368b1a6..8cefb93 100644 --- a/13-13-mongo.yaml +++ b/13-13-mongo.yaml @@ -1,14 +1,17 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: StatefulSet metadata: name: mongo spec: serviceName: "mongo" replicas: 3 + selector: + matchLabels: + name: mongo template: metadata: labels: - app: mongo + name: mongo spec: containers: - name: mongodb diff --git a/13-4-nfs-volume.yaml b/13-4-nfs-volume.yaml index 0bf70b8..00a66ac 100644 --- a/13-4-nfs-volume.yaml +++ b/13-4-nfs-volume.yaml @@ -5,6 +5,9 @@ metadata: labels: volume: my-volume spec: + accessModes: + - ReadWriteOnce + - ReadWriteMany capacity: storage: 1Gi nfs: diff --git a/13-5-nfs-volume-claim.yaml b/13-5-nfs-volume-claim.yaml index 739ba67..9b335cb 100644 --- a/13-5-nfs-volume-claim.yaml +++ b/13-5-nfs-volume-claim.yaml @@ -3,6 +3,9 @@ apiVersion: v1 metadata: name: database spec: + accessModes: + - ReadWriteOnce + - ReadWriteMany resources: requests: storage: 1Gi diff --git a/13-6-mysql-replicaset.yaml b/13-6-mysql-replicaset.yaml index fe70d29..041ef76 100644 --- a/13-6-mysql-replicaset.yaml +++ b/13-6-mysql-replicaset.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: ReplicaSet metadata: name: mysql diff --git a/14-1-parse.yaml b/14-1-parse.yaml index f5b87a6..7194628 100644 --- a/14-1-parse.yaml +++ b/14-1-parse.yaml @@ -1,18 +1,21 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: parse-server namespace: default spec: replicas: 1 + selector: + matchLabels: + name: parse-server template: metadata: labels: - run: parse-server + name: parse-server spec: containers: - name: parse-server - image: ${DOCKER_USER}/parse-server + image: monarene/parse-server env: - name: PARSE_SERVER_DATABASE_URI value: "mongodb://mongo-0.mongo:27017,\ diff --git a/14-10-redis.yaml b/14-10-redis.yaml index 2a8cd58..46a88a6 100644 --- a/14-10-redis.yaml +++ b/14-10-redis.yaml @@ -1,9 +1,12 @@ -apiVersion: apps/v1beta1 +apiVersion: apps/v1 kind: StatefulSet metadata: name: redis spec: replicas: 3 + selector: + matchLabels: + app: redis serviceName: redis template: metadata: diff --git a/14-4-ghost.yaml b/14-4-ghost.yaml index f553ac0..02b9596 100644 --- a/14-4-ghost.yaml +++ b/14-4-ghost.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: ghost diff --git a/8-1-kuard-rs.yaml b/8-1-kuard-rs.yaml index 439b9f6..17099a4 100644 --- a/8-1-kuard-rs.yaml +++ b/8-1-kuard-rs.yaml @@ -1,9 +1,12 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: ReplicaSet metadata: name: kuard spec: - replicas: 1 + replicas: 3 + selector: + matchLabels: + app: kuard template: metadata: labels: @@ -12,4 +15,4 @@ spec: spec: containers: - name: kuard - image: "gcr.io/kuar-demo/kuard-amd64:2" + image: "gcr.io/kuar-demo/kuard-amd64:green" diff --git a/9-1-fluentd.yaml b/9-1-fluentd.yaml index 64065f9..51e5a90 100644 --- a/9-1-fluentd.yaml +++ b/9-1-fluentd.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: DaemonSet metadata: name: fluentd @@ -6,6 +6,9 @@ metadata: labels: app: fluentd spec: + selector: + matchLabels: + app: fluentd template: metadata: labels: diff --git a/9-2-nginx-fast-storage.yaml b/9-2-nginx-fast-storage.yaml index f693e24..69bdea6 100644 --- a/9-2-nginx-fast-storage.yaml +++ b/9-2-nginx-fast-storage.yaml @@ -1,11 +1,14 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: "DaemonSet" metadata: labels: app: nginx ssd: "true" - name: nginx-fast-storage + name: nginx spec: + selector: + matchLabels: + app: nginx template: metadata: labels: diff --git a/nginx-deployment.yaml b/nginx-deployment.yaml new file mode 100644 index 0000000..e919dd1 --- /dev/null +++ b/nginx-deployment.yaml @@ -0,0 +1,65 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + deployment.kubernetes.io/revision: "4" + kubectl.kubernetes.io/last-applied-configuration: | + {"apiVersion":"apps/v1","kind":"Deployment","metadata":{"annotations":{"deployment.kubernetes.io/revision":"1"},"creationTimestamp":"2023-01-11T05:15:20Z","generation":2,"labels":{"app":"nginx"},"name":"nginx","namespace":"default","resourceVersion":"6083099","uid":"26b30b0d-1e2c-43c8-8d14-a77385a5462d"},"spec":{"progressDeadlineSeconds":600,"replicas":2,"revisionHistoryLimit":10,"selector":{"matchLabels":{"app":"nginx"}},"strategy":{"rollingUpdate":{"maxSurge":"25%","maxUnavailable":"25%"},"type":"RollingUpdate"},"template":{"metadata":{"creationTimestamp":null,"labels":{"app":"nginx"}},"spec":{"containers":[{"image":"nginx:1.7.12","imagePullPolicy":"IfNotPresent","name":"nginx","resources":{},"terminationMessagePath":"/dev/termination-log","terminationMessagePolicy":"File"}],"dnsPolicy":"ClusterFirst","restartPolicy":"Always","schedulerName":"default-scheduler","securityContext":{},"terminationGracePeriodSeconds":30}}},"status":{"availableReplicas":2,"conditions":[{"lastTransitionTime":"2023-01-11T05:15:20Z","lastUpdateTime":"2023-01-11T05:15:29Z","message":"ReplicaSet \"nginx-65bfff77cf\" has successfully progressed.","reason":"NewReplicaSetAvailable","status":"True","type":"Progressing"},{"lastTransitionTime":"2023-01-11T05:18:57Z","lastUpdateTime":"2023-01-11T05:18:57Z","message":"Deployment has minimum availability.","reason":"MinimumReplicasAvailable","status":"True","type":"Available"}],"observedGeneration":2,"readyReplicas":2,"replicas":2,"updatedReplicas":2}} + kubernetes.io/change-cause: updared nginx rversion + creationTimestamp: "2023-01-11T05:15:20Z" + generation: 8 + labels: + app: nginx + name: nginx + namespace: default + resourceVersion: "6346243" + uid: 26b30b0d-1e2c-43c8-8d14-a77385a5462d +spec: + progressDeadlineSeconds: 600 + replicas: 3 + revisionHistoryLimit: 10 + selector: + matchLabels: + app: nginx + strategy: + rollingUpdate: + maxSurge: 25% + maxUnavailable: 25% + type: RollingUpdate + template: + metadata: + creationTimestamp: null + labels: + app: nginx + spec: + containers: + - image: nginx:1.9.10 + imagePullPolicy: IfNotPresent + name: nginx + resources: {} + terminationMessagePath: /dev/termination-log + terminationMessagePolicy: File + dnsPolicy: ClusterFirst + restartPolicy: Always + schedulerName: default-scheduler + securityContext: {} + terminationGracePeriodSeconds: 30 +status: + availableReplicas: 3 + conditions: + - lastTransitionTime: "2023-01-11T05:43:30Z" + lastUpdateTime: "2023-01-11T05:43:30Z" + message: Deployment has minimum availability. + reason: MinimumReplicasAvailable + status: "True" + type: Available + - lastTransitionTime: "2023-01-11T05:15:20Z" + lastUpdateTime: "2023-01-11T14:08:59Z" + message: ReplicaSet "nginx-7fb877c8ff" has successfully progressed. + reason: NewReplicaSetAvailable + status: "True" + type: Progressing + observedGeneration: 8 + readyReplicas: 3 + replicas: 3 + updatedReplicas: 3