From 9970fb394095dd2ee81ae51c9d7b8d696461cbef Mon Sep 17 00:00:00 2001
From: Matt Hook <hookenz@gmail.com>
Date: Fri, 5 May 2023 09:20:20 +1200
Subject: [PATCH] fix git options for kube (#8889)

---
 app/kubernetes/views/deploy/deploy.html                        | 2 ++
 app/portainer/components/forms/git-form/git-form.ts            | 2 ++
 .../kubernetes-redeploy-app-git-form.html                      | 1 +
 app/portainer/react/components/git-form.ts                     | 1 +
 app/react/portainer/gitops/GitForm.tsx                         | 3 +++
 5 files changed, 9 insertions(+)

diff --git a/app/kubernetes/views/deploy/deploy.html b/app/kubernetes/views/deploy/deploy.html
index e13c1686a..10a0d4d29 100644
--- a/app/kubernetes/views/deploy/deploy.html
+++ b/app/kubernetes/views/deploy/deploy.html
@@ -80,6 +80,8 @@
                   ng-if="ctrl.state.BuildMethod === ctrl.BuildMethods.GIT"
                   value="ctrl.formValues"
                   on-change="(ctrl.onChangeFormValues)"
+                  environment-type="KUBERNETES"
+                  is-force-pull-visible="false"
                   is-additional-files-field-visible="true"
                   is-auth-explanation-visible="true"
                   deploy-method="{{ ctrl.state.DeployType === ctrl.ManifestDeployTypes.COMPOSE ? 'compose' : 'manifest' }}"
diff --git a/app/portainer/components/forms/git-form/git-form.ts b/app/portainer/components/forms/git-form/git-form.ts
index fb56e78e2..ce7115304 100644
--- a/app/portainer/components/forms/git-form/git-form.ts
+++ b/app/portainer/components/forms/git-form/git-form.ts
@@ -8,6 +8,7 @@ export const gitForm: IComponentOptions = {
   <react-git-form 
     value="$ctrl.value"
     on-change="$ctrl.handleChange"
+    environment-type="$ctrl.environmentType"
     is-docker-standalone="$ctrl.isDockerStandalone"
     deploy-method="$ctrl.deployMethod"
     is-additional-files-field-visible="$ctrl.isAdditionalFilesFieldVisible"
@@ -22,6 +23,7 @@ export const gitForm: IComponentOptions = {
   bindings: {
     value: '<',
     onChange: '<',
+    environmentType: '@',
     isDockerStandalone: '<',
     deployMethod: '@',
     baseWebhookUrl: '@',
diff --git a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
index 64a888758..de32a26cc 100644
--- a/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
+++ b/app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html
@@ -9,6 +9,7 @@
     value="$ctrl.formValues.AutoUpdate"
     on-change="($ctrl.onChangeAutoUpdate)"
     environment-type="KUBERNETES"
+    is-force-pull-visible="false"
     base-webhook-url="{{ $ctrl.state.baseWebhookUrl }}"
     webhook-id="{{ $ctrl.state.webhookId }}"
     webhooks-docs="https://docs.portainer.io/user/kubernetes/applications/webhooks"
diff --git a/app/portainer/react/components/git-form.ts b/app/portainer/react/components/git-form.ts
index 9208a0b48..e7c0a4d68 100644
--- a/app/portainer/react/components/git-form.ts
+++ b/app/portainer/react/components/git-form.ts
@@ -18,6 +18,7 @@ export const gitFormModule = angular
     r2a(withUIRouter(withReactQuery(withCurrentUser(GitForm))), [
       'value',
       'onChange',
+      'environmentType',
       'isDockerStandalone',
       'deployMethod',
       'isAdditionalFilesFieldVisible',
diff --git a/app/react/portainer/gitops/GitForm.tsx b/app/react/portainer/gitops/GitForm.tsx
index 3df8f8c6c..19c947206 100644
--- a/app/react/portainer/gitops/GitForm.tsx
+++ b/app/react/portainer/gitops/GitForm.tsx
@@ -22,6 +22,7 @@ import { refFieldValidation } from './RefField/RefField';
 interface Props {
   value: GitFormModel;
   onChange: (value: Partial<GitFormModel>) => void;
+  environmentType?: 'DOCKER' | 'KUBERNETES' | undefined;
   deployMethod?: 'compose' | 'nomad' | 'manifest';
   isDockerStandalone?: boolean;
   isAdditionalFilesFieldVisible?: boolean;
@@ -36,6 +37,7 @@ interface Props {
 export function GitForm({
   value,
   onChange,
+  environmentType = 'DOCKER',
   deployMethod = 'compose',
   isDockerStandalone = false,
   isAdditionalFilesFieldVisible,
@@ -94,6 +96,7 @@ export function GitForm({
 
       {value.AutoUpdate && (
         <AutoUpdateFieldset
+          environmentType={environmentType}
           webhookId={webhookId}
           baseWebhookUrl={baseWebhookUrl}
           value={value.AutoUpdate}