control-service: clean up Git repository creation in the Helm chart (#…

…209) Since we've moved away from the idea to provision a public Github repository during Helm chart installation, revert the previous changes to the Helm chart. Testing done: Installed the chart manually in a local Kind cluster and verified that the installation is successful and no git repo is created during the process. Signed-off-by: Tsvetomir Palashki <[email protected]>
vmware · Sep 10, 2021 · 3f06fe1 · 3f06fe1
1 parent 20f1780
commit 3f06fe1
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 106 deletions.
diff --git a/.../control-service/projects/helm_charts/pipelines-control-service/templates/deployment.yaml b/.../control-service/projects/helm_charts/pipelines-control-service/templates/deployment.yaml
@@ -52,42 +52,16 @@ spec:
               value: "{{ .Values.notificationOwnerEmail }}"
             - name: NOTIFICATION_OWNER_NAME
               value: "{{ .Values.notificationOwnerName }}"
-            {{- if not .Values.deploymentGitUrl }}
-            - name: GIT_REPO_NAME
-              valueFrom:
-                 secretKeyRef:
-                    name: {{ .Release.Name }}-git-properties
-                    key: git-repo-name
-            - name: GIT_SERVER
-              valueFrom:
-                 secretKeyRef:
-                    name: {{ .Release.Name }}-git-properties
-                    key: git-server
-            {{- end }}
-            {{- if not .Values.deploymentGitUsername }}
-            - name: GIT_DEFAULT_USERNAME
-              valueFrom:
-                 secretKeyRef:
-                    name: {{ .Release.Name }}-git-properties
-                    key: git-username
-            {{- end }}
-            {{- if not .Values.deploymentGitPassword }}
-            - name: GIT_ACCESS_TOKEN
-              valueFrom:
-                 secretKeyRef:
-                    name: {{ .Release.Name }}-git-properties
-                    key: git-access-token
-            {{- end }}
             - name: GIT_URL
-              value: {{ .Values.deploymentGitUrl | default "$(GIT_SERVER)/$(GIT_REPO_NAME).git" | quote }}
+              value: "{{ .Values.deploymentGitUrl }}"
             - name: GIT_BRANCH
               value: "{{ .Values.deploymentGitBranch }}"
             - name: GIT_REMOTE
               value: "{{ .Values.deploymentGitRemote }}"
             - name: GIT_USERNAME
-              value: {{ .Values.deploymentGitUsername | default "$(GIT_DEFAULT_USERNAME)" }}
+              value: "{{ .Values.deploymentGitUsername }}"
             - name: GIT_PASSWORD
-              value: {{ .Values.deploymentGitPassword | default "$(GIT_ACCESS_TOKEN)" }}
+              value: "{{ .Values.deploymentGitPassword }}"
             - name: AWS_REGION
               value: "{{ .Values.deploymentEcrAwsRegion }}"
             - name: AWS_ACCESS_KEY_ID

diff --git a/...e/projects/helm_charts/pipelines-control-service/templates/hooks/job_create_git_repo.yaml b/...e/projects/helm_charts/pipelines-control-service/templates/hooks/job_create_git_repo.yaml
diff --git a/...projects/helm_charts/pipelines-control-service/templates/hooks/secret_git_properties.yaml b/...projects/helm_charts/pipelines-control-service/templates/hooks/secret_git_properties.yaml
diff --git a/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml b/projects/control-service/projects/helm_charts/pipelines-control-service/values.yaml
@@ -128,12 +128,9 @@ deploymentK8sKubeconfig: ""
 ## It's is ok to leave it empty (by default).
 controlK8sNamespace: ""
 
-## Git repository where deployed data jobs source can be found and from where they will be deployed.
-## If not specified, the Helm installation will create a public Github repository at
-## https://github.com/versatile-data-kit-jobs with a random UUID as name.
+## [Required] Git repository where deployed data jobs source can be found and from where they will be deployed.
 # Git URL (without https:// scheme)
 deploymentGitUrl: ""
-deploymentGitRepoName: ""
 deploymentGitBranch: "main"
 deploymentGitRemote: "origin"
 # Credentials with read-only access to the Git repository.