Skip to content

Commit

Permalink
Merge pull request #640 from DharmitD/external-tls-refactor
Browse files Browse the repository at this point in the history
Refactor ConfigMap and Secret paths for TLS enabled DB/Storage
  • Loading branch information
openshift-merge-bot[bot] authored May 9, 2024
2 parents 4659bdc + 3af7b77 commit c55325e
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 14 deletions.
6 changes: 6 additions & 0 deletions .github/resources/external-pre-reqs/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- minio-secret.yaml
- mariadb-secret.yaml
- root-ca-configmap.yaml
10 changes: 10 additions & 0 deletions .github/resources/external-pre-reqs/mariadb-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
kind: Secret
apiVersion: v1
metadata:
name: ds-pipeline-db-test
labels:
app: mariadb
component: data-science-pipelines
stringData:
password: password
type: Opaque
8 changes: 8 additions & 0 deletions .github/resources/external-pre-reqs/minio-secret.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
kind: Secret
apiVersion: v1
metadata:
name: minio
stringData:
accesskey: accesskey
secretkey: secretkey
type: Opaque
1 change: 0 additions & 1 deletion .github/resources/mariadb/secret.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ kind: Secret
apiVersion: v1
metadata:
name: ds-pipeline-db-test
namespace: test-mariadb
labels:
app: mariadb
component: data-science-pipelines
Expand Down
17 changes: 4 additions & 13 deletions .github/workflows/kind-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ on:
- api/**
- config/**
- tests/**
- .github/resources/**
types:
- opened
- reopened
Expand Down Expand Up @@ -114,20 +115,10 @@ jobs:
run: |
kubectl create namespace ${{ env.DSPA_EXTERNAL_NAMESPACE }}
- name: Create Minio Secrets
- name: Apply MariaDB and Minio Secrets and Configmaps in the External Namespace
working-directory: ${{ github.workspace }}/.github/resources/external-pre-reqs
run: |
kubectl create secret generic minio --from-literal=accesskey=accesskey --from-literal=secretkey=secretkey -n ${{ env.DSPA_EXTERNAL_NAMESPACE }}
- name: Create MariaDB Secrets
run: |
password=$(kubectl get secret ds-pipeline-db-test -n test-mariadb -o jsonpath="{.data.password}" | base64 --decode)
kubectl create secret generic ds-pipeline-db-test --from-literal=password="$password" -n ${{ env.DSPA_EXTERNAL_NAMESPACE }}
- name: Apply rootCA ConfigMap
env:
RESOURCES_DIR: ${{ github.workspace }}/.github/resources
run: |
kubectl apply -f ${{ env.RESOURCES_DIR }}/tls/root-ca-configmap.yaml -n ${{ env.DSPA_EXTERNAL_NAMESPACE }}
kustomize build . | oc -n ${{ env.DSPA_EXTERNAL_NAMESPACE }} apply -f -
- name: Run tests
working-directory: ${{ github.workspace }}
Expand Down

0 comments on commit c55325e

Please sign in to comment.