deployment and helm charts update for release 1.5.3 (#394)
* update manifests for release 1.5.3 * add new feature flags * update changelog for 1.5.3 * unset enable scale features in helm * add selector as part of move to apps/v1 * remove testing changes * update test manifests
This commit is contained in:
Родитель
8e84d5ef64
Коммит
76d3a9bd1d
Двоичный файл не отображается.
|
@ -1,8 +1,8 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
description: Deploy components for aad-pod-identity
|
description: Deploy components for aad-pod-identity
|
||||||
name: aad-pod-identity
|
name: aad-pod-identity
|
||||||
version: 1.5.2
|
version: 1.5.3
|
||||||
appVersion: 1.5.2
|
appVersion: 1.5.3
|
||||||
home: https://github.com/Azure/aad-pod-identity
|
home: https://github.com/Azure/aad-pod-identity
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/Azure/aad-pod-identity
|
- https://github.com/Azure/aad-pod-identity
|
||||||
|
|
|
@ -56,6 +56,12 @@ spec:
|
||||||
{{- if .Values.mic.probePort }}
|
{{- if .Values.mic.probePort }}
|
||||||
- --http-probe-port={{ .Values.mic.probePort }}
|
- --http-probe-port={{ .Values.mic.probePort }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if .Values.mic.createDeleteBatch }}
|
||||||
|
- --createDeleteBatch={{ .Values.mic.createDeleteBatch }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if .Values.mic.clientQps }}
|
||||||
|
- --clientQps={{ .Values.mic.clientQps }}
|
||||||
|
{{- end }}
|
||||||
env:
|
env:
|
||||||
- name: FORCENAMESPACED
|
- name: FORCENAMESPACED
|
||||||
value: "{{ .Values.forceNameSpaced }}"
|
value: "{{ .Values.forceNameSpaced }}"
|
||||||
|
|
|
@ -15,7 +15,7 @@ rules:
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list"]
|
||||||
- apiGroups: [""]
|
- apiGroups: [""]
|
||||||
resources: ["pods"]
|
resources: ["pods"]
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list", "watch"]
|
||||||
{{- if .Values.rbac.allowAccessToSecrets }}
|
{{- if .Values.rbac.allowAccessToSecrets }}
|
||||||
- apiGroups: [""]
|
- apiGroups: [""]
|
||||||
resources: ["secrets"]
|
resources: ["secrets"]
|
||||||
|
@ -23,8 +23,8 @@ rules:
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- apiGroups: ["aadpodidentity.k8s.io"]
|
- apiGroups: ["aadpodidentity.k8s.io"]
|
||||||
resources: ["azureidentitybindings", "azureidentities", "azurepodidentityexceptions"]
|
resources: ["azureidentitybindings", "azureidentities", "azurepodidentityexceptions"]
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list", "watch"]
|
||||||
- apiGroups: ["aadpodidentity.k8s.io"]
|
- apiGroups: ["aadpodidentity.k8s.io"]
|
||||||
resources: ["azureassignedidentities"]
|
resources: ["azureassignedidentities"]
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list", "watch"]
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
|
@ -62,6 +62,9 @@ spec:
|
||||||
{{- if .Values.nmi.findIdentityRetryIntervalInSeconds }}
|
{{- if .Values.nmi.findIdentityRetryIntervalInSeconds }}
|
||||||
- --find-identity-retry-interval={{ .Values.nmi.findIdentityRetryIntervalInSeconds }}
|
- --find-identity-retry-interval={{ .Values.nmi.findIdentityRetryIntervalInSeconds }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if .Values.nmi.enableScaleFeatures }}
|
||||||
|
- --enableScaleFeatures={{ .Values.nmi.enableScaleFeatures }}
|
||||||
|
{{- end }}
|
||||||
env:
|
env:
|
||||||
- name: HOST_IP
|
- name: HOST_IP
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
|
|
@ -24,7 +24,7 @@ forceNameSpaced: "false"
|
||||||
|
|
||||||
mic:
|
mic:
|
||||||
image: mic
|
image: mic
|
||||||
tag: 1.5.2
|
tag: 1.5.3
|
||||||
|
|
||||||
# log level. Uses V logs (glog)
|
# log level. Uses V logs (glog)
|
||||||
# logVerbosity: 0
|
# logVerbosity: 0
|
||||||
|
@ -62,9 +62,17 @@ mic:
|
||||||
# Override interval in seconds at which sync loop should periodically check for errors and reconcile (default is 3600s)
|
# Override interval in seconds at which sync loop should periodically check for errors and reconcile (default is 3600s)
|
||||||
syncRetryDuration: ""
|
syncRetryDuration: ""
|
||||||
|
|
||||||
|
# https://github.com/Azure/aad-pod-identity/blob/master/docs/readmes/README.featureflags.md#batch-create-delete-flag
|
||||||
|
# default value is 20
|
||||||
|
createDeleteBatch: ""
|
||||||
|
|
||||||
|
# https://github.com/Azure/aad-pod-identity/blob/master/docs/readmes/README.featureflags.md#client-qps-flag
|
||||||
|
# default value is 5
|
||||||
|
clientQps: ""
|
||||||
|
|
||||||
nmi:
|
nmi:
|
||||||
image: nmi
|
image: nmi
|
||||||
tag: 1.5.2
|
tag: 1.5.3
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
|
@ -101,6 +109,10 @@ nmi:
|
||||||
# Override retry interval to find assigned identities in seconds (default is 5)
|
# Override retry interval to find assigned identities in seconds (default is 5)
|
||||||
findIdentityRetryIntervalInSeconds: ""
|
findIdentityRetryIntervalInSeconds: ""
|
||||||
|
|
||||||
|
# Enable scale features - https://github.com/Azure/aad-pod-identity/blob/master/docs/readmes/README.featureflags.md#enable-scale-features-flag
|
||||||
|
# Accepted values are true/false. Default is false.
|
||||||
|
enableScaleFeatures: ""
|
||||||
|
|
||||||
rbac:
|
rbac:
|
||||||
enabled: true
|
enabled: true
|
||||||
# NMI requires permissions to get secrets when service principal (type: 1) is used in AzureIdentity.
|
# NMI requires permissions to get secrets when service principal (type: 1) is used in AzureIdentity.
|
||||||
|
|
|
@ -1,9 +1,24 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
entries:
|
entries:
|
||||||
aad-pod-identity:
|
aad-pod-identity:
|
||||||
|
- apiVersion: v1
|
||||||
|
appVersion: 1.5.3
|
||||||
|
created: "2019-10-11T15:59:33.322904-07:00"
|
||||||
|
description: Deploy components for aad-pod-identity
|
||||||
|
digest: 3dab91c7f115d23123f863eeea1c93a34640a42ac1e7052600020600fbfa55ad
|
||||||
|
home: https://github.com/Azure/aad-pod-identity
|
||||||
|
maintainers:
|
||||||
|
- email: anish.ramasekar@gmail.com
|
||||||
|
name: aramase
|
||||||
|
name: aad-pod-identity
|
||||||
|
sources:
|
||||||
|
- https://github.com/Azure/aad-pod-identity
|
||||||
|
urls:
|
||||||
|
- https://raw.githubusercontent.com/Azure/aad-pod-identity/master/charts/aad-pod-identity-1.5.3.tgz
|
||||||
|
version: 1.5.3
|
||||||
- apiVersion: v1
|
- apiVersion: v1
|
||||||
appVersion: 1.5.2
|
appVersion: 1.5.2
|
||||||
created: "2019-09-16T11:43:42.435047-07:00"
|
created: "2019-10-11T15:59:33.321838-07:00"
|
||||||
description: Deploy components for aad-pod-identity
|
description: Deploy components for aad-pod-identity
|
||||||
digest: 58a8ea212a1461f72ce17be5b767dac920d0f56803c026320a16c22de3ed365a
|
digest: 58a8ea212a1461f72ce17be5b767dac920d0f56803c026320a16c22de3ed365a
|
||||||
home: https://github.com/Azure/aad-pod-identity
|
home: https://github.com/Azure/aad-pod-identity
|
||||||
|
@ -16,4 +31,4 @@ entries:
|
||||||
urls:
|
urls:
|
||||||
- https://raw.githubusercontent.com/Azure/aad-pod-identity/master/charts/aad-pod-identity-1.5.2.tgz
|
- https://raw.githubusercontent.com/Azure/aad-pod-identity/master/charts/aad-pod-identity-1.5.2.tgz
|
||||||
version: 1.5.2
|
version: 1.5.2
|
||||||
generated: "2019-09-16T11:43:42.434192-07:00"
|
generated: "2019-10-11T15:59:33.31978-07:00"
|
||||||
|
|
|
@ -64,16 +64,16 @@ rules:
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list"]
|
||||||
- apiGroups: [""]
|
- apiGroups: [""]
|
||||||
resources: ["pods"]
|
resources: ["pods"]
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list", "watch"]
|
||||||
- apiGroups: [""]
|
- apiGroups: [""]
|
||||||
resources: ["secrets"]
|
resources: ["secrets"]
|
||||||
verbs: ["get"]
|
verbs: ["get"]
|
||||||
- apiGroups: ["aadpodidentity.k8s.io"]
|
- apiGroups: ["aadpodidentity.k8s.io"]
|
||||||
resources: ["azureidentitybindings", "azureidentities", "azurepodidentityexceptions"]
|
resources: ["azureidentitybindings", "azureidentities", "azurepodidentityexceptions"]
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list", "watch"]
|
||||||
- apiGroups: ["aadpodidentity.k8s.io"]
|
- apiGroups: ["aadpodidentity.k8s.io"]
|
||||||
resources: ["azureassignedidentities"]
|
resources: ["azureassignedidentities"]
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list", "watch"]
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
apiVersion: rbac.authorization.k8s.io/v1beta1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
|
@ -90,7 +90,7 @@ roleRef:
|
||||||
name: aad-pod-id-nmi-role
|
name: aad-pod-id-nmi-role
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: apps/v1
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -103,6 +103,10 @@ metadata:
|
||||||
spec:
|
spec:
|
||||||
updateStrategy:
|
updateStrategy:
|
||||||
type: RollingUpdate
|
type: RollingUpdate
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
component: nmi
|
||||||
|
tier: node
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -118,7 +122,7 @@ spec:
|
||||||
name: iptableslock
|
name: iptableslock
|
||||||
containers:
|
containers:
|
||||||
- name: nmi
|
- name: nmi
|
||||||
image: "mcr.microsoft.com/k8s/aad-pod-identity/nmi:1.5.2"
|
image: "mcr.microsoft.com/k8s/aad-pod-identity/nmi:1.5.3"
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
args:
|
args:
|
||||||
- "--host-ip=$(HOST_IP)"
|
- "--host-ip=$(HOST_IP)"
|
||||||
|
@ -201,7 +205,7 @@ roleRef:
|
||||||
name: aad-pod-id-mic-role
|
name: aad-pod-id-mic-role
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -211,6 +215,10 @@ metadata:
|
||||||
namespace: default
|
namespace: default
|
||||||
spec:
|
spec:
|
||||||
replicas: 2
|
replicas: 2
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
component: mic
|
||||||
|
app: mic
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -220,7 +228,7 @@ spec:
|
||||||
serviceAccountName: aad-pod-id-mic-service-account
|
serviceAccountName: aad-pod-id-mic-service-account
|
||||||
containers:
|
containers:
|
||||||
- name: mic
|
- name: mic
|
||||||
image: "mcr.microsoft.com/k8s/aad-pod-identity/mic:1.5.2"
|
image: "mcr.microsoft.com/k8s/aad-pod-identity/mic:1.5.3"
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
args:
|
args:
|
||||||
- "--cloudconfig=/etc/kubernetes/azure.json"
|
- "--cloudconfig=/etc/kubernetes/azure.json"
|
||||||
|
|
|
@ -48,7 +48,7 @@ spec:
|
||||||
plural: azurepodidentityexceptions
|
plural: azurepodidentityexceptions
|
||||||
scope: Namespaced
|
scope: Namespaced
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: apps/v1
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -60,6 +60,10 @@ metadata:
|
||||||
spec:
|
spec:
|
||||||
updateStrategy:
|
updateStrategy:
|
||||||
type: RollingUpdate
|
type: RollingUpdate
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
component: nmi
|
||||||
|
tier: node
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -74,7 +78,7 @@ spec:
|
||||||
name: iptableslock
|
name: iptableslock
|
||||||
containers:
|
containers:
|
||||||
- name: nmi
|
- name: nmi
|
||||||
image: "mcr.microsoft.com/k8s/aad-pod-identity/nmi:1.5.2"
|
image: "mcr.microsoft.com/k8s/aad-pod-identity/nmi:1.5.3"
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
args:
|
args:
|
||||||
- "--host-ip=$(HOST_IP)"
|
- "--host-ip=$(HOST_IP)"
|
||||||
|
@ -112,7 +116,7 @@ spec:
|
||||||
nodeSelector:
|
nodeSelector:
|
||||||
beta.kubernetes.io/os: linux
|
beta.kubernetes.io/os: linux
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -121,6 +125,9 @@ metadata:
|
||||||
namespace: default
|
namespace: default
|
||||||
spec:
|
spec:
|
||||||
replicas: 2
|
replicas: 2
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
component: mic
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -128,7 +135,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mic
|
- name: mic
|
||||||
image: "mcr.microsoft.com/k8s/aad-pod-identity/mic:1.5.2"
|
image: "mcr.microsoft.com/k8s/aad-pod-identity/mic:1.5.3"
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
args:
|
args:
|
||||||
- "--kubeconfig=/etc/kubernetes/kubeconfig/kubeconfig"
|
- "--kubeconfig=/etc/kubernetes/kubeconfig/kubeconfig"
|
||||||
|
|
|
@ -64,16 +64,16 @@ rules:
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list"]
|
||||||
- apiGroups: [""]
|
- apiGroups: [""]
|
||||||
resources: ["pods"]
|
resources: ["pods"]
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list", "watch"]
|
||||||
- apiGroups: [""]
|
- apiGroups: [""]
|
||||||
resources: ["secrets"]
|
resources: ["secrets"]
|
||||||
verbs: ["get"]
|
verbs: ["get"]
|
||||||
- apiGroups: ["aadpodidentity.k8s.io"]
|
- apiGroups: ["aadpodidentity.k8s.io"]
|
||||||
resources: ["azureidentitybindings", "azureidentities", "azurepodidentityexceptions"]
|
resources: ["azureidentitybindings", "azureidentities", "azurepodidentityexceptions"]
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list", "watch"]
|
||||||
- apiGroups: ["aadpodidentity.k8s.io"]
|
- apiGroups: ["aadpodidentity.k8s.io"]
|
||||||
resources: ["azureassignedidentities"]
|
resources: ["azureassignedidentities"]
|
||||||
verbs: ["get", "list"]
|
verbs: ["get", "list", "watch"]
|
||||||
---
|
---
|
||||||
apiVersion: rbac.authorization.k8s.io/v1beta1
|
apiVersion: rbac.authorization.k8s.io/v1beta1
|
||||||
kind: ClusterRoleBinding
|
kind: ClusterRoleBinding
|
||||||
|
@ -90,7 +90,7 @@ roleRef:
|
||||||
name: aad-pod-id-nmi-role
|
name: aad-pod-id-nmi-role
|
||||||
apiGroup: rbac.authorization.k8s.io
|
apiGroup: rbac.authorization.k8s.io
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: apps/v1
|
||||||
kind: DaemonSet
|
kind: DaemonSet
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -101,6 +101,10 @@ metadata:
|
||||||
name: nmi
|
name: nmi
|
||||||
namespace: default
|
namespace: default
|
||||||
spec:
|
spec:
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
component: nmi
|
||||||
|
tier: node
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -116,7 +120,7 @@ spec:
|
||||||
name: iptableslock
|
name: iptableslock
|
||||||
containers:
|
containers:
|
||||||
- name: nmi
|
- name: nmi
|
||||||
image: "mcr.microsoft.com/k8s/aad-pod-identity/nmi:1.5.2"
|
image: "mcr.microsoft.com/k8s/aad-pod-identity/nmi:1.5.3"
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
args:
|
args:
|
||||||
- "--host-ip=$(HOST_IP)"
|
- "--host-ip=$(HOST_IP)"
|
||||||
|
@ -213,7 +217,7 @@ metadata:
|
||||||
name: aadpodidentity-admin-secret
|
name: aadpodidentity-admin-secret
|
||||||
namespace: default
|
namespace: default
|
||||||
---
|
---
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: apps/v1
|
||||||
kind: Deployment
|
kind: Deployment
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -223,6 +227,9 @@ metadata:
|
||||||
namespace: default
|
namespace: default
|
||||||
spec:
|
spec:
|
||||||
replicas: 2
|
replicas: 2
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
component: mic
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -231,7 +238,7 @@ spec:
|
||||||
serviceAccountName: aad-pod-id-mic-service-account
|
serviceAccountName: aad-pod-id-mic-service-account
|
||||||
containers:
|
containers:
|
||||||
- name: mic
|
- name: mic
|
||||||
image: "mcr.microsoft.com/k8s/aad-pod-identity/mic:1.5.2"
|
image: "mcr.microsoft.com/k8s/aad-pod-identity/mic:1.5.3"
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
args:
|
args:
|
||||||
- "--logtostderr"
|
- "--logtostderr"
|
||||||
|
|
|
@ -58,6 +58,10 @@ metadata:
|
||||||
name: nmi
|
name: nmi
|
||||||
namespace: default
|
namespace: default
|
||||||
spec:
|
spec:
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
component: nmi
|
||||||
|
tier: node
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -72,7 +76,7 @@ spec:
|
||||||
name: iptableslock
|
name: iptableslock
|
||||||
containers:
|
containers:
|
||||||
- name: nmi
|
- name: nmi
|
||||||
image: "mcr.microsoft.com/k8s/aad-pod-identity/nmi:1.5.2"
|
image: "mcr.microsoft.com/k8s/aad-pod-identity/nmi:1.5.3"
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
args:
|
args:
|
||||||
- "--host-ip=$(HOST_IP)"
|
- "--host-ip=$(HOST_IP)"
|
||||||
|
@ -133,6 +137,9 @@ metadata:
|
||||||
namespace: default
|
namespace: default
|
||||||
spec:
|
spec:
|
||||||
replicas: 2
|
replicas: 2
|
||||||
|
selector:
|
||||||
|
matchLabels:
|
||||||
|
component: mic
|
||||||
template:
|
template:
|
||||||
metadata:
|
metadata:
|
||||||
labels:
|
labels:
|
||||||
|
@ -140,7 +147,7 @@ spec:
|
||||||
spec:
|
spec:
|
||||||
containers:
|
containers:
|
||||||
- name: mic
|
- name: mic
|
||||||
image: "mcr.microsoft.com/k8s/aad-pod-identity/mic:1.5.2"
|
image: "mcr.microsoft.com/k8s/aad-pod-identity/mic:1.5.3"
|
||||||
imagePullPolicy: Always
|
imagePullPolicy: Always
|
||||||
args:
|
args:
|
||||||
- "--kubeconfig=/etc/kubernetes/kubeconfig/kubeconfig"
|
- "--kubeconfig=/etc/kubernetes/kubeconfig/kubeconfig"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче