Skip to content

Commit ab0aceb

Browse files
rjeberhardrjeberhard
committed
Merge branch 'dep-and-version-40' into 'release/4.0'
Update dependency versions and update for 4.0.7 development See merge request weblogic-cloud/weblogic-kubernetes-operator!4193
2 parents 8f70222 + c07d724 commit ab0aceb

File tree

15 files changed

+69
-27
lines changed

15 files changed

+69
-27
lines changed

‎common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>oracle.kubernetes</groupId>
88
<artifactId>operator-parent</artifactId>
9-
<version>4.0.6</version>
9+
<version>4.0.7-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>common</artifactId>

‎domain-upgrader/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>oracle.kubernetes</groupId>
99
<artifactId>operator-parent</artifactId>
10-
<version>4.0.6</version>
10+
<version>4.0.7-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>domain-upgrader</artifactId>

‎integration-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>oracle.kubernetes</groupId>
99
<artifactId>operator-parent</artifactId>
10-
<version>4.0.6</version>
10+
<version>4.0.7-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>integration-tests</artifactId>

‎json-schema-generator/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<artifactId>operator-parent</artifactId>
99
<groupId>oracle.kubernetes</groupId>
10-
<version>4.0.6</version>
10+
<version>4.0.7-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>json-schema</artifactId>

‎kubernetes/charts/weblogic-operator/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ name: weblogic-operator
66
description: Helm chart for configuring the WebLogic operator.
77

88
type: application
9-
version: 4.0.6
10-
appVersion: 4.0.6
9+
version: 4.0.7-SNAPSHOT
10+
appVersion: 4.0.7-SNAPSHOT

‎kubernetes/charts/weblogic-operator/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ domainNamespaceSelectionStrategy: LabelSelector
5454
enableClusterRoleBinding: true
5555

5656
# image specifies the container image containing the operator.
57-
image: "ghcr.io/oracle/weblogic-kubernetes-operator:4.0.6"
57+
image: "ghcr.io/oracle/weblogic-kubernetes-operator:4.0.7-SNAPSHOT"
5858

5959
# imagePullPolicy specifies the image pull policy for the operator's container image.
6060
imagePullPolicy: IfNotPresent

‎kubernetes/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>oracle.kubernetes</groupId>
1111
<artifactId>operator-parent</artifactId>
12-
<version>4.0.6</version>
12+
<version>4.0.7-SNAPSHOT</version>
1313
</parent>
1414

1515
<artifactId>installation-tests</artifactId>

‎kubernetes/samples/charts/nginx/README.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,22 @@ $ kubectl exec -it $POD_NAME -n nginx -- /nginx-ingress-controller --version
4545
```
4646
> **NOTE**: All the generated Kubernetes resources of the NGINX operator have names controlled by the NGINX Helm chart. In our case, we use `releaseName` of `nginx-operator`.
4747
48+
After the installation is complete, you can check the NGINX ingress status:
49+
50+
```shell
51+
$ kubectl -n nginx get services
52+
```
53+
54+
```
55+
pod/nginx-operator-ingress-nginx-controller-84fbd64787-v4p4c 1/1 Running 0 11m
56+
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
57+
service/nginx-operator-ingress-nginx-controller LoadBalancer 10.107.159.96 <pending> 80:31470/TCP,443:32465/TCP 11m
58+
service/nginx-operator-ingress-nginx-controller-admission ClusterIP 10.109.12.133 <none> 443/TCP 11m
59+
```
60+
61+
If the `EXTERNAL-IP` column shows `<pending>`, you can access the NGINX ingress through your Kubernetes cluster address and nodeports `31470/32465`. For example, `http://<k8s cluster address>:31470/myappurl` or `https://<k8s cluster address>:32465/myappurl`. If the `EXTERNAL-IP` column shows a real IP address, then you can also access the ingress through the IP address that is the external load balancer address without specifying the port value. For example, `http://<ip address>/myappurl` or `https://<ip address>/myappurl`.
62+
63+
4864
## Configure NGINX as a load balancer for WebLogic domains
4965
We'll demonstrate how to use NGINX to handle traffic to backend WebLogic domains.
5066

@@ -69,7 +85,9 @@ ingress.networking.k8s.io/domain2-ingress-host created
6985
```
7086
Now you can send requests to different WebLogic domains with the unique NGINX entry point of different host names as defined in the route section of the `host-routing.yaml` file.
7187
```shell
72-
# Get the ingress controller web port
88+
# Get the ingress controller service nodeport values
89+
# HOSTNAME is your Kubernetes cluster address
90+
# See installation section for how to access the ingress
7391
$ export LB_PORT=$(kubectl -n nginx get service nginx-operator-ingress-nginx-controller -o jsonpath='{.spec.ports[?(@.name=="http")].nodePort}')
7492
$ curl -H 'host: domain1.org' http://${HOSTNAME}:${LB_PORT}/testwebapp/
7593
$ curl -H 'host: domain2.org' http://${HOSTNAME}:${LB_PORT}/testwebapp/

‎kubernetes/samples/charts/traefik/README.md

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,19 @@ You can also install the Traefik operator with a custom `values.yaml` file. For
1818
$ helm install traefik-operator traefik/traefik --namespace traefik --values values.yaml
1919
```
2020

21+
After the installation is complete, you can check the Traefik ingress status:
22+
23+
```shell
24+
$ kubectl -n traefik get services
25+
```
26+
27+
```
28+
NAME TYPE CLUSTER-IP EXTERNAL-IP PORT(S) AGE
29+
traefik-operator LoadBalancer 10.96.x.y 129.x.y.z 80:30518/TCP,443:30144/TCP 4m49s
30+
```
31+
32+
If the `EXTERNAL-IP` column shows `<pending>`, you can access the Traefik ingress through your Kubernetes cluster address and nodeports `30518/30144`. For example, `http://<k8s cluster address>:30518/myappurl` or `https://<k8s cluster address>:30144/myappurl`. If the `EXTERNAL-IP` column shows a real IP address, then you can also access the ingress through the IP address that is the external load balancer address without specifying the port value. For example, `http://129.x.y.z/myappurl` or `https://129.x.y.z/myappurl`.
33+
2134
## Configure Traefik as a load balancer for WebLogic domains
2235
This section describes how to use Traefik to handle traffic to backend WebLogic domains.
2336

@@ -42,7 +55,10 @@ ingressroute.traefik.containo.us/traefik-hostrouting-2 created
4255
```
4356
Now you can send requests to different WebLogic domains with the unique Traefik entry point of different host names as defined in the route section of the `host-routing.yaml` file.
4457
```shell
45-
# Get the ingress controller web port
58+
# Get the ingress controller service nodeport values
59+
# HOSTNAME is your Kubernetes cluster address
60+
# See installation section for how to access the ingress
61+
4662
$ export LB_PORT=$(kubectl -n traefik get service traefik-operator -o jsonpath='{.spec.ports[?(@.name=="web")].nodePort}')
4763
$ curl -H 'host: domain1.org' http://${HOSTNAME}:${LB_PORT}/testwebapp/
4864
$ curl -H 'host: domain2.org' http://${HOSTNAME}:${LB_PORT}/testwebapp/

‎kubernetes/samples/scripts/create-weblogic-domain/model-in-image/utils/opss-wallet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
# Copyright (c) 2019, 2022, Oracle and/or its affiliates.
2+
# Copyright (c) 2019, 2023, Oracle and/or its affiliates.
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44

55
#

0 commit comments

Comments
 (0)