Merge pull request #1067 from alialkhalidi/factor-jobs

chore: group jobs together; addresses #1056

Makefile

@@ -25,7 +25,7 @@ DID_ELEMENT_SIDETREE_REQUEST_URL ?= https://element-did.com/api/v1/sidetree/requ
 SANDBOX_CLI_IMAGE_NAME       ?= trustbloc/sandbox-cli
 
 # TrustBloc core k8s deployment scripts https://github.com/trustbloc/k8s
-TRUSTBLOC_CORE_K8S_COMMIT=c1f79a5b35d1357ef2a6a636c19d04ead6c37858
+TRUSTBLOC_CORE_K8S_COMMIT=82609002c2bc25bf8001056caef6caadedca28cb
 
 # Tool commands (overridable)
 ALPINE_VER ?= 3.12

k8s/ace-rp/Makefile

@@ -21,12 +21,10 @@ ARCH  				= $(shell uname -m | sed 's/x86_64/amd64/')
 
 #IMAGES
 ACE_RP_IMG				?= ghcr.io/trustbloc-cicd/sandbox-ace-rp:0.1.7-snapshot-62aff49
-CLI_IMG				?= ghcr.io/trustbloc-cicd/sandbox-cli:0.1.7-snapshot-62aff49
 
 # do not modify
 KUSTOMIZE_DIR       	= kustomize/ace-rp
 CERTS_OUTPUT_DIR      	 	= ${KUSTOMIZE_DIR}/overlays/${DEPLOYMENT_ENV}/certs
-REGISTRY_DIRECTORY           	= ${KUSTOMIZE_DIR}/base/registry
 PREFIX							?=
 KUSTOMIZE_BUILD_OPTS			?= --load-restrictor LoadRestrictionsNone --enable-alpha-plugins
 export KUSTOMIZE_PLUGIN_HOME						= $(abspath .)/kustomize/plugin
@@ -75,9 +73,6 @@ set-labels: kustomize
 set-images: kustomize
 	@pushd ${KUSTOMIZE_DIR}/base &&\
 	${KUSTOMIZE} edit set image sandbox-ace-rp=${ACE_RP_IMG} &&\
-	popd &&\
-	pushd ${KUSTOMIZE_DIR}/overlays/common &&\
-	${KUSTOMIZE} edit set image sandbox-cli=${CLI_IMG} &&\
 	popd
 
 .PHONY: deploy-ace-rp
@@ -125,10 +120,7 @@ endif
 clean: clean-all
 
 .PHONY: clean-all
-clean-all: clean-certs clean-registry
-
-.PHONY: clean-no-registry
-clean-no-registry: clean-certs
+clean-all: clean-certs
 
 .PHONY: clean-certs
 clean-certs:

k8s/ace-rp/kustomize/ace-rp/overlays/common/kustomization.yaml

@@ -33,9 +33,6 @@ configMapGenerator:
   envs:
   - benefits-dept/config.env
   name: benefits-dept-ace-rp-env
-- files:
-  - ace_rp_configure.sh
-  name: ace-rp-profiles-script
 
 secretGenerator:
 - behavior: merge
@@ -55,16 +52,7 @@ resources:
 - ../ucis
 - ../cbp
 - ../benefits-dept
-- create-profiles.yml
 
 transformers:
 - sedtransform.yml
 - sedb64transform.yml
-
-
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-images:
-- name: sandbox-cli
-  newName: ghcr.io/trustbloc-cicd/sandbox-cli
-  newTag: 0.1.7-snapshot-62aff49

k8s/cms/kustomize/cms/overlays/common/kustomization.yaml

@@ -21,13 +21,6 @@ commonLabels:
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
-resources:
-- strapi/user-data.yml
-- oathkeeper/role.yml
-- oathkeeper/rolebinding.yml
-- oathkeeper/process-template.yml
-
-
 transformers:
 - sedtransform.yml
 - sedb64transform.yml
@@ -37,16 +30,7 @@ components:
 - ../../components/oathkeeper
 
 configMapGenerator:
-- files:
-  - strapi/user_data.sh
-  name: strapi-user-data-script
 - behavior: replace
   files:
   - oathkeeper/config.yml
   name: oathkeeper-config
-- files:
-  - oathkeeper/process_template.sh
-  name: process-template-script
-- files:
-  - oathkeeper/access-rules.tmpl
-  name: access-rules-template

k8s/comparator/Makefile

@@ -120,15 +120,8 @@ endif
 clean: clean-all
 
 .PHONY: clean-all
-clean-all: clean-certs clean-registry
-
-.PHONY: clean-no-registry
-clean-no-registry: clean-certs
+clean-all: clean-certs
 
 .PHONY: clean-certs
 clean-certs:
 	@rm -Rf ${CERTS_OUTPUT_DIR}
-
-.PHONY: clean-registry
-clean-registry:
-	@rm -Rf ${REGISTRY_DIRECTORY}

k8s/issuer/Makefile

@@ -121,9 +121,6 @@ clean: clean-all
 .PHONY: clean-all
 clean-all: clean-certs
 
-.PHONY: clean-no-registry
-clean-no-registry: clean-certs
-
 .PHONY: clean-certs
 clean-certs:
 	@rm -Rf ${CERTS_OUTPUT_DIR}

k8s/issuer/kustomize/issuer/overlays/common/kustomization.yaml

@@ -25,9 +25,6 @@ configMapGenerator:
   envs:
   - config.env
   name: issuer-env
-- files:
-  - register-tenant.sh
-  name: issuer-register-tenant-script
 
 secretGenerator:
 - behavior: merge
@@ -37,9 +34,6 @@ secretGenerator:
 
 resources:
 - ../../base
-- role.yml
-- rolebinding.yml
-- register-tenant.yml
 
 transformers:
 - sedtransform.yml