Update

hyperledger-bevel · Dec 30, 2023 · a2fd5b0 · a2fd5b0
1 parent 440f920
commit a2fd5b0
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 35 deletions.
diff --git a/.github/kind-config.yaml b/.github/kind-config.yaml
@@ -6,4 +6,4 @@ nodes:
       - containerPort: 30949
         hostPort: 80
       - containerPort: 30950
-        hostPort: 443
+        hostPort: 443
diff --git a/.github/workflows/test-kubectl-plugin.yml b/.github/workflows/test-kubectl-plugin.yml
@@ -52,8 +52,8 @@ jobs:
           make generate manifests install
       - name: Install Istio
         run: |
-          curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.16.1 TARGET_ARCH=x86_64 sh -
-          export PATH="$PATH:$PWD/istio-1.16.1/bin"
+          curl -L https://istio.io/downloadIstio | ISTIO_VERSION=1.20.0 TARGET_ARCH=x86_64 sh -
+          export PATH="$PATH:$PWD/istio-1.20.0/bin"
           kubectl create namespace istio-system
 
           istioctl operator init
@@ -127,8 +127,6 @@ jobs:
 
       - name: Configure DNS in Kubernetes
         run: |
-          CLUSTER_IP=$(kubectl -n istio-system get svc istio-ingressgateway -o json | jq -r .spec.clusterIP)
-          echo "CLUSTER_IP=${CLUSTER_IP}"
           kubectl apply -f - <<EOF
           kind: ConfigMap
           apiVersion: v1
@@ -142,9 +140,8 @@ jobs:
                   health {
                      lameduck 5s
                   }
-                  rewrite name regex (.*)\.localho\.st host.ingress.internal
+                  rewrite name regex (.*)\.localho\.st istio-ingressgateway.istio-system.svc.cluster.local
                   hosts {
-                    ${CLUSTER_IP} host.ingress.internal
                     fallthrough
                   }
                   ready
@@ -169,10 +166,10 @@ jobs:
       - name: Create Peer org
         run: |
           export PEER_IMAGE=hyperledger/fabric-peer
-          export PEER_VERSION=2.5.0
+          export PEER_VERSION=2.5.5
 
           export CA_IMAGE=hyperledger/fabric-ca
-          export CA_VERSION=1.5.6
+          export CA_VERSION=1.5.7
 
           kubectl hlf ca create --image=$CA_IMAGE --version=$CA_VERSION --storage-class=standard --capacity=2Gi --name=org1-ca \
               --enroll-id=enroll --hosts=org1-ca.localho.st --enroll-pw=enrollpw
@@ -190,10 +187,10 @@ jobs:
       - name: Create Orderer Org
         run: |
           export ORDERER_IMAGE=hyperledger/fabric-orderer
-          export ORDERER_VERSION=2.5.0
+          export ORDERER_VERSION=2.5.5
 
           export CA_IMAGE=hyperledger/fabric-ca
-          export CA_VERSION=1.5.6
+          export CA_VERSION=1.5.7
 
           kubectl hlf ca create --image=$CA_IMAGE --version=$CA_VERSION --storage-class=standard --capacity=2Gi --name=ord-ca \
               --enroll-id=enroll --enroll-pw=enrollpw --hosts=ord-ca.localho.st
@@ -258,7 +255,7 @@ jobs:
               --identities="OrdererMSP;admin-tls-ordservice.yaml" \
               --identities="Org1MSP;peer-org1.yaml"
 
-          kubectl wait --timeout=180s --for=condition=Created fabricmainchannels.hlf.kungfusoftware.es --all 
+          kubectl wait --timeout=180s --for=condition=RUNNING fabricmainchannels.hlf.kungfusoftware.es --all 
 
 
       - name: Join peers to channel
@@ -276,7 +273,7 @@ jobs:
               --secret-ns=default \
               --secret-key="peer-org1.yaml"
 
-          kubectl wait --timeout=180s --for=condition=Created fabricfollowerchannels.hlf.kungfusoftware.es --all 
+          kubectl wait --timeout=180s --for=condition=RUNNING fabricfollowerchannels.hlf.kungfusoftware.es --all
       - name: Get channel
         run: |
           sleep 3

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -18,7 +18,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Create k8s Kind Cluster
-        uses: helm/[email protected]
+        uses: helm/[email protected]
+        with:
+          cluster_name: kind
+          node_image: kindest/node:v1.25.8
+          config: .github/kind-config.yaml
+
       - name: Install operator
         run: | 
           go install sigs.k8s.io/controller-tools/cmd/[email protected]

diff --git a/README.md b/README.md
@@ -228,7 +228,6 @@ export CA_VERSION=1.5.7
 ### Configure Internal DNS
 
 ```bash
-CLUSTER_IP=$(kubectl -n istio-system get svc istio-ingressgateway -o json | jq -r .spec.clusterIP)
 kubectl apply -f - <<EOF
 kind: ConfigMap
 apiVersion: v1
@@ -242,9 +241,8 @@ data:
         health {
            lameduck 5s
         }
-        rewrite name regex (.*)\.localho\.st host.ingress.internal
+        rewrite name regex (.*)\.localho\.st istio-ingressgateway.istio-system.svc.cluster.local
         hosts {
-          ${CLUSTER_IP} host.ingress.internal
           fallthrough
         }
         ready

diff --git a/charts/hlf-ordnode/templates/service.yaml b/charts/hlf-ordnode/templates/service.yaml
@@ -7,10 +7,6 @@ metadata:
 spec:
   type: {{ .Values.service.type }}
   ports:
-    - port: 443
-      targetPort: 7050
-      protocol: TCP
-      name: grpc-443
     - port: {{ .Values.service.port }}
       targetPort: 7050
       protocol: TCP

diff --git a/controllers/peer/peer_controller.go b/controllers/peer/peer_controller.go
@@ -1607,15 +1607,6 @@ func createPeerService(
 	serviceSpec := corev1.ServiceSpec{
 		Type: peer.Spec.Service.Type,
 		Ports: []corev1.ServicePort{
-			{
-				Name:     "peer-443",
-				Protocol: "TCP",
-				Port:     443,
-				TargetPort: intstr.IntOrString{
-					Type:   intstr.Int,
-					IntVal: 7051,
-				},
-			},
 			{
 				Name:     PeerPortName,
 				Protocol: "TCP",

diff --git a/controllers/tests/ca_controller_test.go b/controllers/tests/ca_controller_test.go
@@ -246,7 +246,7 @@ func randomFabricCA(releaseName string, namespace string) *hlfv1alpha1.FabricCA
 			},
 			CLRSizeLimit: 512000,
 			Image:        "hyperledger/fabric-ca",
-			Version:      "1.4.9",
+			Version:      "1.5.7",
 			Debug:        true,
 			TLS:          hlfv1alpha1.FabricCATLSConf{Subject: subject},
 			CA: hlfv1alpha1.FabricCAItemConf{
@@ -834,7 +834,7 @@ var _ = Describe("Fabric Controllers", func() {
 				},
 				CLRSizeLimit: 512000,
 				Image:        "hyperledger/fabric-ca",
-				Version:      "1.4.9",
+				Version:      "1.5.7",
 				Debug:        true,
 				TLS:          hlfv1alpha1.FabricCATLSConf{Subject: subject},
 				CA: hlfv1alpha1.FabricCAItemConf{

diff --git a/kubectl-hlf/cmd/helpers/constants.go b/kubectl-hlf/cmd/helpers/constants.go
@@ -8,10 +8,10 @@ const (
 	DefaultStorageclass = ""
 
 	DefaultCAImage   = "hyperledger/fabric-ca"
-	DefaultCAVersion = "1.4.9"
+	DefaultCAVersion = "1.5.7"
 
 	DefaultPeerImage   = "hyperledger/fabric-peer"
-	DefaultPeerVersion = "2.4.9"
+	DefaultPeerVersion = "2.5.5"
 
 	DefaultOperationsConsoleImage   = "ghcr.io/hyperledger-labs/fabric-console"
 	DefaultOperationsConsoleVersion = "latest"
@@ -29,5 +29,5 @@ const (
 	DefaultCouchDBVersion = "3.1.1"
 
 	DefaultOrdererImage   = "hyperledger/fabric-orderer"
-	DefaultOrdererVersion = "amd64-2.4.9"
+	DefaultOrdererVersion = "2.5.5"
 )