Skip to content

Commit f3bca08

Browse files
skommalaabhijit-paranjpetelakeroberto-sanchez-herreraPM-Darshan
authored
Development (#329)
Merge development to main --------- Co-authored-by: Abhijit Paranjpe <[email protected]> Co-authored-by: telake <[email protected]> Co-authored-by: Roberto Sanchez Herrera <[email protected]> Co-authored-by: P M Darshan <[email protected]> Co-authored-by: C R Aniruddh Srivatsa <[email protected]> Co-authored-by: Mahuwa Barman <[email protected]> Co-authored-by: Chintamani Bhat <[email protected]> Co-authored-by: Sarada Kommalapati <[email protected]> Co-authored-by: Adrian Padilla Duarte <[email protected]> Co-authored-by: Mahuwa-Barman <[email protected]> Co-authored-by: srjanaki <[email protected]> Co-authored-by: ManviGupta-prog <[email protected]> Co-authored-by: Ananya Tripathi <[email protected]> Co-authored-by: Siddharth Sahu <[email protected]> Co-authored-by: Siddharth Sahu <[email protected]>
1 parent 480e757 commit f3bca08

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "25.2.1-250501174252"
4+
tf_script_version = "25.3.1-250719002626"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaawd5ti5ldjzdppppi675onvo3mvjcwt64jjey7rib3beau2ngkl2q"
7-
listing_resource_version = "25.2.1-ol8.8-23.12.13-250501-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaajrz5nejct4fotwr32os5vstdxmqei6kmdg3pdbawmb5z45do7z3a"
7+
listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaau76znd35hrciub7wfojcgfq435bqpehv4ry4fcmom74b7l7zw4ta"
99

1010
ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
11-
ucm_listing_resource_version = "25.2.1-ol8.8-23.12.13-250501-1"
12-
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaaoz7wfnqx73jwv7wi7ygvl6u7ibqkx5fkxtuojslub2zg3rt243ya"
11+
ucm_listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
12+
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaajf5gc2zhxbzbfhvnujt6k2do3rd4wfjqspuq6gmtm2qhhberjttq"
1313

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "25.2.1-250501174252"
4+
tf_script_version = "25.3.1-250719002626"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaa653zc2e4fsem5hhwinmfgnv3xp4dmbq6c6gvf45okxf6xz3smhiq"
7-
listing_resource_version = "25.2.1-ol8.8-23.12.13-250501-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaaoz7wfnqx73jwv7wi7ygvl6u7ibqkx5fkxtuojslub2zg3rt243ya"
7+
listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaajf5gc2zhxbzbfhvnujt6k2do3rd4wfjqspuq6gmtm2qhhberjttq"
99

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "25.2.1-250501174252"
4+
tf_script_version = "25.3.1-250719002626"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaalcwal6mfwjbezzqyj3waoxrvigml4n3lcn3hfday3ozetjqn25a"
7-
listing_resource_version = "25.2.1-ol8.8-23.12.13-250501-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaanbgbtvim2nr2qzg2w5ojoizpbynwjxlxkwdoxlr2wh2254t5sklq"
7+
listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaajzkamkicy6azk2deaudb363i7z7elwniunootc3v6755p3kfjv3a"
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "25.2.1-250501174252"
4+
tf_script_version = "25.3.1-250719002626"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaajl5w3d76x5vdc4n7oqjpsxh4jtwivclvvp6gj4em3kufju6sftga"
7-
listing_resource_version = "25.2.1-ol8.8-23.12.13-250501-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaamoezz5gwft4hyerr2er6y3cy2gpqyucuyvwuwqixwmdyqonegfwa"
7+
listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
8+
instance_image_id = "ocid1"
99

1010
ucm_listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
11-
ucm_listing_resource_version = "25.2.1-ol8.8-23.12.13-250501-1"
12-
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaaphngemq3h2c3tt4wym5oofln7vhyp7cwk2jko7bsqhrxoezdccma"
11+
ucm_listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
12+
ucm_instance_image_id = "ocid1.image.oc1..aaaaaaaa45odr7hkyw7dm7x3ho2s57iywvwahf5654njhpb7f6fvziz4w42q"
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Copyright (c) 2023,2024, Oracle and/or its affiliates.
22
# Licensed under the Universal Permissive License v1.0 as shown at https://oss.oracle.com/licenses/upl.
33

4-
tf_script_version = "25.2.1-250501174252"
4+
tf_script_version = "25.3.1-250719002626"
55
use_marketplace_image = true
66
listing_id = "ocid1.appcataloglisting.oc1..aaaaaaaaq2vkow7zwkxg6ky4zxsnckdlfgtgmg7i4kkyev3y6zyo72mpkgza"
7-
listing_resource_version = "25.2.1-ol8.8-23.12.13-250501-1"
8-
instance_image_id = "ocid1.image.oc1..aaaaaaaaphngemq3h2c3tt4wym5oofln7vhyp7cwk2jko7bsqhrxoezdccma"
7+
listing_resource_version = "25.3.1-ol8.8-23.12.13-250719-1"
8+
instance_image_id = "ocid1.image.oc1..aaaaaaaa45odr7hkyw7dm7x3ho2s57iywvwahf5654njhpb7f6fvziz4w42q"

terraform/modules/compute/wls_compute/idcs_variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@ variable "idcs_cloudgate_config_file" {
7474
variable "idcs_cloudgate_docker_image_tar" {
7575
type = string
7676
description = "Path of the binary file with the container image to run IDCS cloudgate container in the WebLogic VM"
77-
default = "/u01/zips/jcs/app_gateway_docker/23.4.44/app-gateway-docker-image.tar.gz"
77+
default = "/u01/zips/jcs/app_gateway_docker/25.1.03/app-gateway-docker-image.tar.gz"
7878
}
7979

8080
variable "idcs_cloudgate_docker_image_version" {
8181
type = string
8282
description = "Version of the container image to run IDCS cloudgate container in the WebLogic VM"
83-
default = "23.4.44-2310291619"
83+
default = "25.1.03-2501230623"
8484
}
8585

8686
variable "idcs_cloudgate_docker_image_name" {
8787
type = string
8888
description = "Name of the container image to run IDCS cloudgate container in the WebLogic VM"
89-
default = "idcs-appgateway-docker"
89+
default = "idcs-appgateway-docker_linux_x86_64"
9090
}
9191

9292
variable "lbip" {

terraform/modules/lb/backends/lb_backends.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ resource "oci_load_balancer_listener" "wls_lb_listener_https" {
6767
rule_set_names = [oci_load_balancer_rule_set.SSL_headers[count.index].name]
6868

6969
connection_configuration {
70-
idle_timeout_in_seconds = "10"
70+
idle_timeout_in_seconds = "300"
7171
}
7272
ssl_configuration {
7373
#Required

terraform/modules/policies/locals.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ locals {
3636
logging_policy = var.use_oci_logging ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use logging-family in compartment id ${var.compartment_id}" : ""
3737
# This policy with "use apm-domains" verb is needed to list the data keys of the APM domain
3838
apm_domain_policy_statement = var.use_apm_service ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use apm-domains in compartment id ${var.apm_domain_compartment_id}" : ""
39-
# This policy with "use load_balancer" verb is needed to create load balancer for new vcn
39+
# This policy with "use load_balancer" verb is needed because there is code in the Weblogic for OCI compute image that sets the lb backend states.
4040
lb_policy_statement = var.add_load_balancer ? length(oci_identity_dynamic_group.wlsc_instance_principal_group) > 0 ? "Allow dynamic-group ${oci_identity_dynamic_group.wlsc_instance_principal_group.name} to use load-balancers in compartment id ${var.network_compartment_id}" : "" : ""
4141
service_statements = compact([local.core_policy_statement1, local.core_policy_statement2, local.core_policy_statement3, local.core_policy_statement4, local.network_policy_statement1, local.secrets_policy_statement1, local.secrets_policy_statement2,
4242
local.atp_policy_statement1, local.atp_policy_statement2, local.atp_policy_statement3, local.oci_db_policy_statement1, local.oci_db_policy_statement2, local.oci_db_policy_statement3, local.logging_policy,

0 commit comments

Comments
 (0)