Merge pull request #21 from hazelcast-guides/revert-20-cn-1202

Revert "[CN-1202] Revisit Connect to Hazelcast from Outside Kubernetes Tutorial"

.github/workflows/integrational-tests.yml

@@ -8,7 +8,6 @@ env:
   GCP_PROJECT_ID: ${{ secrets.GKE_PROJECT }}
   GKE_ZONE: europe-west1-b
   GCP_NETWORK: tutorial-test-network
-  EXAMPLES_DIR: docs/modules/ROOT/examples
 
 jobs:
   create-gke-cluster:
@@ -80,10 +79,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
-      - name: Set up JDK
+      - name: Set up JDK 1.8
         uses: actions/setup-java@v2
         with:
-          java-version: 17
+          java-version: 8
           distribution: "adopt"
           cache: "maven"
 
@@ -164,7 +163,7 @@ jobs:
       - name: Test Java Client
         run: |-
           EXTERNAL_IP="${{ env.EXTERNAL_IP }}"
-          cd $EXAMPLES_DIR/java${{matrix.suffix}}
+          cd java${{matrix.suffix}}
           sed -i "s/<EXTERNAL-IP>/$EXTERNAL_IP/g" src/main/java/com/hazelcast/Main.java
           mvn package
           java -jar target/*jar-with-dependencies*.jar >> output-java.txt &
@@ -177,7 +176,7 @@ jobs:
       - name: Test Node.js Client
         run: |-
           EXTERNAL_IP="${{ env.EXTERNAL_IP }}"
-          cd $EXAMPLES_DIR/nodejs${{matrix.suffix}}
+          cd nodejs${{matrix.suffix}}
           sed -i "s/<EXTERNAL-IP>/$EXTERNAL_IP/g" client.js
           npm install
           npm start >> output-nodejs.txt &
@@ -190,7 +189,7 @@ jobs:
       - name: Test Go Client
         run: |-
           EXTERNAL_IP="${{ env.EXTERNAL_IP }}"
-          cd $EXAMPLES_DIR/go${{matrix.suffix}}
+          cd go${{matrix.suffix}}
           sed -i "s/<EXTERNAL-IP>/$EXTERNAL_IP/g" main.go
           go run main.go >> output-go.txt &
           PID=$!
@@ -202,7 +201,7 @@ jobs:
       - name: Test Python Client
         run: |-
           EXTERNAL_IP="${{ env.EXTERNAL_IP }}"
-          cd $EXAMPLES_DIR/python${{matrix.suffix}}
+          cd python${{matrix.suffix}}
           sed -i "s/<EXTERNAL-IP>/$EXTERNAL_IP/g" main.py
           pip install -r requirements.txt
           python main.py >> output-python.txt &

docs/modules/ROOT/pages/hazelcast-platform-operator-expose-externally.adoc

@@ -16,9 +16,7 @@
 
 * Up and running https://kubernetes.io/[Kubernetes] cluster
 * Kubernetes command-line tool, https://kubernetes.io/docs/tasks/tools/#kubectl[kubectl]
-* Deployed xref:operator:ROOT:get-started.adoc[Hazelcast Platform Operator]
-
-WARNING: This tutorial uses LoadBalancer services to connect to Hazelcast from outside of the Kubernetes cluster. Therefore, it is essential to ensure that your Kubernetes cluster can assign public IPs to LoadBalancer services. This is particularly important if you are using a local Kubernetes cluster such as Minikube or Kind.
+* Deployed xref:operator:ROOT:index.adoc[Hazelcast Platform Operator]
 
 == Introduction
 
@@ -43,8 +41,15 @@ Run the following command to create the Hazelcast cluster with Expose Externally
 
 [source, shell]
 ----
-kubectl apply -f - <<EOF
-include::ROOT:example$/hazelcast-unisocket.yaml[]
+cat <<EOF | kubectl apply -f -
+apiVersion: hazelcast.com/v1alpha1
+kind: Hazelcast
+metadata:
+  name: my-hazelcast
+spec:
+  exposeExternally:
+    type: Unisocket
+    discoveryServiceType: LoadBalancer
 EOF
 ----
 
@@ -78,15 +83,13 @@ The `ADDRESS` column displays the external address of your Hazelcast cluster.
 
 === Connect Hazelcast Clients to the Cluster
 
-To access all sample clients, clone the following repository:
-
+To access all examples (excluding CLC), clone the following repository.
 [source,shell]
 ----
 git clone https://github.com/hazelcast-guides/hazelcast-platform-operator-expose-externally.git
 cd hazelcast-platform-operator-expose-externally
 ----
 
-. The sample code(excluding CLC) for this tutorial is in the link:https://github.com/hazelcast-guides/hazelcast-platform-operator-expose-externally/tree/master/docs/modules/ROOT/examples[`docs/modules/ROOT/examples/`] directory.
 
 Configure the Hazelcast client with the external address and disable smart routing to use the unisocket connection.
 
@@ -111,7 +114,9 @@ Java::
 --
 [source, java]
 ----
-include::ROOT:example$/java-unisocket/src/main/java/com/hazelcast/Main.java[]
+ClientConfig config = new ClientConfig();
+config.getNetworkConfig().addAddress("<EXTERNAL-IP>")
+                         .setSmartRouting(false);
 ----
 --
 
@@ -120,7 +125,17 @@ NodeJS::
 --
 [source, javascript]
 ----
-include::ROOT:example$/nodejs-unisocket/client.js[]
+const { Client } = require('hazelcast-client');
+
+const clientConfig = {
+    network: {
+        clusterMembers: [
+            '<EXTERNAL-IP>'
+        ],
+        smartRouting: false
+    }
+};
+const client = await Client.newHazelcastClient(clientConfig);
 ----
 --
 
@@ -129,7 +144,23 @@ Go::
 --
 [source, go]
 ----
-include::ROOT:example$/go-unisocket/main.go[]
+import (
+	"log"
+
+	"github.com/hazelcast/hazelcast-go-client"
+)
+
+func main() {
+	config := hazelcast.Config{}
+	cc := &config.Cluster
+	cc.Network.SetAddresses("<EXTERNAL-IP>")
+	cc.Unisocket = true
+	ctx := context.TODO()
+	client, err := hazelcast.StartNewClientWithConfig(ctx, config)
+	if err != nil {
+		panic(err)
+	}
+}
 ----
 --
 
@@ -138,15 +169,32 @@ Python::
 --
 [source, python]
 ----
-include::ROOT:example$/python-unisocket/main.py[]
+import logging
+import hazelcast
+
+logging.basicConfig(level=logging.INFO)
+
+client = hazelcast.HazelcastClient(
+    cluster_members=["<EXTERNAL-IP>"],
+    smart_routing=False,
+)
 ----
 --
 .NET::
 +
 --
 [source, cs]
 ----
-include::ROOT:example$/dotnet-unisocket/csharp_example.cs[]
+var options = new HazelcastOptionsBuilder()
+    .With(args)
+    .With((configuration, options) =>
+    {
+        options.LoggerFactory.Creator = () => LoggerFactory.Create(loggingBuilder => loggingBuilder.AddConfiguration(configuration.GetSection("logging")).AddConsole());
+        options.Networking.Addresses.Add("<EXTERNAL-IP>");
+        options.Networking.SmartRouting = false;
+    })
+    .Build();
+var client = await HazelcastClientFactory.StartNewClientAsync(options);
 ----
 --
 ====
@@ -310,8 +358,16 @@ Run the following command to create the Hazelcast cluster with Expose Externally
 
 [source, shell]
 ----
-kubectl apply -f - <<EOF
-include::ROOT:example$/hazelcast.yaml[]
+cat <<EOF | kubectl apply -f -
+apiVersion: hazelcast.com/v1alpha1
+kind: Hazelcast
+metadata:
+  name: my-hazelcast
+spec:
+  exposeExternally:
+    type: Smart
+    discoveryServiceType: LoadBalancer
+    memberAccess: LoadBalancer
 EOF
 ----
 
@@ -379,7 +435,9 @@ Java::
 --
 [source, java]
 ----
-include::ROOT:example$/java/src/main/java/com/hazelcast/Main.java[]
+ClientConfig config = new ClientConfig();
+config.getNetworkConfig().addAddress("<EXTERNAL-IP>");
+config.getProperties().setProperty(ClientProperty.DISCOVERY_SPI_PUBLIC_IP_ENABLED.toString(), "true");
 ----
 --
 
@@ -388,7 +446,19 @@ NodeJS::
 --
 [source, javascript]
 ----
-include::ROOT:example$/nodejs/client.js[]
+const { Client } = require('hazelcast-client');
+
+const clientConfig = {
+    network: {
+        clusterMembers: [
+            '<EXTERNAL-IP>'
+        ]
+    },
+    properties: {
+        ['hazelcast.discovery.public.ip.enabled']: true
+    }
+};
+const client = await Client.newHazelcastClient(clientConfig);
 ----
 --
 
@@ -397,7 +467,23 @@ Go::
 --
 [source, go]
 ----
-include::ROOT:example$/go/main.go[]
+import (
+	"log"
+
+	"github.com/hazelcast/hazelcast-go-client"
+)
+
+func main() {
+	config := hazelcast.Config{}
+	cc := &config.Cluster
+	cc.Network.SetAddresses("<EXTERNAL-IP>")
+    cc.Discovery.UsePublicIP = true
+	ctx := context.TODO()
+	client, err := hazelcast.StartNewClientWithConfig(ctx, config)
+	if err != nil {
+		panic(err)
+	}
+}
 ----
 --
 
@@ -406,15 +492,33 @@ Python::
 --
 [source, python]
 ----
-include::ROOT:example$/python/main.py[]
+import logging
+import hazelcast
+
+logging.basicConfig(level=logging.INFO)
+
+client = hazelcast.HazelcastClient(
+    cluster_members=["<EXTERNAL-IP>"],
+    use_public_ip=True,
+)
 ----
 --
 .Net::
 +
 --
 [source, cs]
 ----
-include::ROOT:example$/dotnet/csharp_example.cs[]
+var options = new HazelcastOptionsBuilder()
+    .With(args)
+    .With((configuration, options) =>
+    {
+        options.LoggerFactory.Creator = () => LoggerFactory.Create(loggingBuilder => loggingBuilder.AddConfiguration(configuration.GetSection("logging")).AddConsole());
+        options.Networking.Addresses.Add("<EXTERNAL-IP>");
+        options.Networking.UsePublicAddresses = true;
+
+    })
+    .Build();
+var client = await HazelcastClientFactory.StartNewClientAsync(options);
 ----
 --
 ====

docs/modules/ROOT/examples/dotnet-unisocket/dotnet-unisocket.csproj → dotnet-unisocket/dotnet-unisocket.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Hazelcast.Net" Version="5.3.1" />
+      <PackageReference Include="Hazelcast.Net" Version="5.3.0" />
       <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0-preview.6.23329.7" />
       <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     </ItemGroup>

docs/modules/ROOT/examples/dotnet/dotnet.csproj → dotnet/dotnet.csproj

@@ -8,7 +8,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="Hazelcast.Net" Version="5.3.1" />
+      <PackageReference Include="Hazelcast.Net" Version="5.3.0" />
       <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
     </ItemGroup>
 

docs/modules/ROOT/examples/go-unisocket/go.mod → go-unisocket/go.mod

@@ -3,6 +3,6 @@ module github.com/hazelcast-guides/kubernetes/go
 go 1.15
 
 require (
-	github.com/hazelcast/hazelcast-go-client v1.4.1
+	github.com/hazelcast/hazelcast-go-client v1.4.0
 	github.com/shirou/gopsutil/v3 v3.21.10 // indirect
 )

docs/modules/ROOT/examples/go-unisocket/go.sum → go-unisocket/go.sum

@@ -11,8 +11,8 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hazelcast/hazelcast-go-client v1.4.1 h1:BSpJqqjbACI4MugfWXGxk+JdZR3JRELx0n769pa85kA=
-github.com/hazelcast/hazelcast-go-client v1.4.1/go.mod h1:PJ38lqXJ18S0YpkrRznPDlUH8GnnMAQCx3jpQtBPZ6Q=
+github.com/hazelcast/hazelcast-go-client v1.4.0 h1:8+fvcG+Owf5mi3qezc8FN9CG6Vpb6x8tqKTb9nXrQWk=
+github.com/hazelcast/hazelcast-go-client v1.4.0/go.mod h1:PJ38lqXJ18S0YpkrRznPDlUH8GnnMAQCx3jpQtBPZ6Q=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

docs/modules/ROOT/examples/go/go.mod → go/go.mod

@@ -3,6 +3,6 @@ module github.com/hazelcast-guides/kubernetes/go
 go 1.15
 
 require (
-	github.com/hazelcast/hazelcast-go-client v1.4.1
+	github.com/hazelcast/hazelcast-go-client v1.4.0
 	github.com/shirou/gopsutil/v3 v3.21.10 // indirect
 )

docs/modules/ROOT/examples/go/go.sum → go/go.sum

@@ -11,8 +11,8 @@ github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
 github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/hazelcast/hazelcast-go-client v1.4.1 h1:BSpJqqjbACI4MugfWXGxk+JdZR3JRELx0n769pa85kA=
-github.com/hazelcast/hazelcast-go-client v1.4.1/go.mod h1:PJ38lqXJ18S0YpkrRznPDlUH8GnnMAQCx3jpQtBPZ6Q=
+github.com/hazelcast/hazelcast-go-client v1.4.0 h1:8+fvcG+Owf5mi3qezc8FN9CG6Vpb6x8tqKTb9nXrQWk=
+github.com/hazelcast/hazelcast-go-client v1.4.0/go.mod h1:PJ38lqXJ18S0YpkrRznPDlUH8GnnMAQCx3jpQtBPZ6Q=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

docs/modules/ROOT/examples/java-unisocket/pom.xml → java-unisocket/pom.xml

@@ -9,15 +9,15 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>5.4.0</version>
+            <version>5.0</version>
         </dependency>
     </dependencies>
 

docs/modules/ROOT/examples/java/pom.xml → java/pom.xml

@@ -9,15 +9,15 @@
     <version>1.0-SNAPSHOT</version>
 
     <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>com.hazelcast</groupId>
             <artifactId>hazelcast</artifactId>
-            <version>5.4.0</version>
+            <version>5.0</version>
         </dependency>
     </dependencies>