Skip to content

Commit c8efd42

Browse files
committed
Remove values
1 parent 5b9d665 commit c8efd42

1 file changed

Lines changed: 3 additions & 28 deletions

File tree

ods-api-service/Makefile

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ export $(shell sed 's/=.*//' ../../ods-configuration/ods-core.ods-api-service.en
1717

1818

1919
##### HELM CHART MANAGEMENT
20-
.PHONY: ods-api-service-helm-encrypt-secrets ods-api-service-helm-decrypt-secrets ods-api-service-helm-diff ods-api-service-render-helm-chart
20+
.PHONY: ods-api-service-helm-encrypt-secrets ods-api-service-helm-decrypt-secrets ods-api-service-render-helm-chart
2121

2222
## Render ODS API Service Helm chart with all configurations (values and secrets).
2323
ods-api-service-render-helm-chart:
@@ -68,7 +68,7 @@ ods-api-service-render-application-yaml:
6868
--set ODS_OPENSHIFT_APP_DOMAIN=$(OPENSHIFT_APPS_BASEDOMAIN) \
6969
2>/dev/null | \
7070
yq -r 'select(.kind == "ConfigMap") | select(.metadata.name == "ods-api-service-config") | .data["application.yaml"]'
71-
71+
7272

7373
## Render the generated .env file from Helm templates to a local file.
7474
ods-api-service-renderdot-env:
@@ -113,31 +113,6 @@ ods-api-service-helm-decrypt-secrets:
113113
../scripts/decrypt-helm-secrets.sh $(ODS_CONFIGURATION_DIR) $(ENV)
114114
@echo "✓ Secrets decrypted"
115115

116-
## Diff Helm chart against cluster using helm secrets diff
117-
ods-api-service-helm-diff:
118-
@echo "Running helm secrets diff (dry-run through Makefile)..."
119-
@export HELM_DIFF_IGNORE_UNKNOWN_FLAGS=true && helm -n devstack-dev secrets diff upgrade --install --atomic \
120-
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.values.yaml \
121-
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.secrets.enc.yaml \
122-
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/values.yaml \
123-
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/secrets.enc.yaml \
124-
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/$(env)/values.$(env).yaml \
125-
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/$(env)/secrets.$(env).enc.yaml \
126-
--set projectId=devstack \
127-
--set appSelector=app=devstack-api-service \
128-
--set registry=image-registry.openshift-image-registry.svc:5000 \
129-
--set componentId=api-service \
130-
--set global.projectId=devstack \
131-
--set global.appSelector=app=devstack-api-service \
132-
--set global.registry=image-registry.openshift-image-registry.svc:5000 \
133-
--set global.componentId=api-service \
134-
--set imageNamespace=devstack-dev \
135-
--set imageTag=b19c9164 \
136-
--set global.imageNamespace=devstack-dev \
137-
--set global.imageTag=b19c9164 \
138-
--set ODS_OPENSHIFT_APP_DOMAIN=apps.eu-dev.ocp.aws.boehringer.com \
139-
--no-color --three-way-merge --normalize-manifests \
140-
api-service ./chart
141116

142117
help:
143118
@echo ''
@@ -156,4 +131,4 @@ help:
156131
} \
157132
} \
158133
{ lastLine = $$0 }' $(MAKEFILE_LIST)
159-
.PHONY: help
134+
.PHONY: help

0 commit comments

Comments
 (0)