Skip to content

Commit 42bc936

Browse files
authored
update module.yaml (#16)
* update module.yaml * updated operand request variables
1 parent 2dfd303 commit 42bc936

File tree

4 files changed

+16
-6
lines changed

4 files changed

+16
-6
lines changed

charts/ibm-cpd-db2wh-operandregistry/scripts/update_operandregistry.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ SOURCE_NAME="ibm-db2uoperator-catalog"
1010
echo "ZEN Operator namespace"
1111
echo $ZEN_OPERATORS_NAMESPACE
1212

13+
echo "COMMON Operator namespace"
14+
echo $COMMON_SERVICES_NAMESPACE
15+
1316
oc get operandregistry common-service -n ${COMMON_SERVICES_NAMESPACE} -o json > /temp/operandregistry.json
1417

1518
jq --arg ZEN_OPERATORS_NAMESPACE $ZEN_OPERATORS_NAMESPACE '(.spec.operators[] | select(.name == "ibm-db2u-operator")).namespace |= $ZEN_OPERATORS_NAMESPACE' /temp/operandregistry.json > /temp/operandregistry_new.json
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
operator_namespace: cpd-operators
2-
common_services_namespace: ibm-common-services
1+
# operator_namespace: cpd-operators
2+
# common_services_namespace: ibm-common-services

main.tf

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ locals {
3636

3737
}
3838

39+
operand_content = {
40+
41+
operator_namespace = var.operator_namespace
42+
common_services_namespace = var.common_services_namespace
43+
44+
}
45+
3946
instance_content = {
4047
name = "db2wh-cr"
4148
cpd_namespace = var.cpd_namespace
@@ -89,7 +96,7 @@ resource null_resource create_operandregistry_yaml {
8996
command = "${path.module}/scripts/create-yaml.sh '${local.operandregistry_name}' '${local.operandregistry_yaml_dir}'"
9097

9198
environment = {
92-
VALUES_CONTENT = yamlencode(local.subscription_content)
99+
VALUES_CONTENT = yamlencode(local.operand_content)
93100
}
94101
}
95102
}

module.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ versions:
1818
refs:
1919
- source: github.com/cloud-native-toolkit/terraform-gitops-namespace.git
2020
version: ">= 1.0.0"
21-
- id: gitops-cp4d-instance
21+
- id: gitops-db2
2222
refs:
23-
- source: github.com/cloud-native-toolkit/terraform-gitops-cp4d-instance.git
24-
version: ">= 0.0.1"
23+
- source: github.com/cloud-native-toolkit/terraform-gitops-db2u-operator.git
24+
version: ">= 0.0.1"
2525
variables:
2626
- name: gitops_config
2727
moduleRef:

0 commit comments

Comments
 (0)