Remove kafka profiles from configtx.yaml (#5115)

As of v3.0.0 these profiles should not be used. Signed-off-by: Yoav Tock <[email protected]>
hyperledger · Jan 22, 2025 · 9336215 · 9336215
1 parent 075ba68
commit 9336215
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 118 deletions.
diff --git a/orderer/common/cluster/testdata/blockverification/configtx.yaml b/orderer/common/cluster/testdata/blockverification/configtx.yaml
@@ -495,20 +495,6 @@ Profiles:
                 Organizations:
                     - *SampleOrg
 
-    # SampleSingleMSPKafka defines a configuration that differs from the
-    # SampleSingleMSPSolo one only in that it uses the Kafka-based orderer.
-    SampleSingleMSPKafka:
-        <<: *ChannelDefaults
-        Orderer:
-            <<: *OrdererDefaults
-            OrdererType: kafka
-            Organizations:
-                - *SampleOrg
-        Consortiums:
-            SampleConsortium:
-                Organizations:
-                    - *SampleOrg
-
     # SampleInsecureSolo defines a configuration which uses the Solo orderer,
     # contains no MSP definitions, and allows all transactions and channel
     # creation requests for the consortium SampleConsortium.
@@ -521,17 +507,6 @@ Profiles:
             SampleConsortium:
                 Organizations:
 
-    # SampleInsecureKafka defines a configuration that differs from the
-    # SampleInsecureSolo one only in that it uses the Kafka-based orderer.
-    SampleInsecureKafka:
-        <<: *ChannelDefaults
-        Orderer:
-            <<: *OrdererDefaults
-            OrdererType: kafka
-        Consortiums:
-            SampleConsortium:
-                Organizations:
-
     # SampleDevModeSolo defines a configuration which uses the Solo orderer,
     # contains the sample MSP as both orderer and consortium member, and
     # requires only basic membership for admin privileges. It also defines
@@ -568,39 +543,6 @@ Profiles:
                               Type: Signature
                               Rule: "OR('SampleOrg.member')"
 
-    # SampleDevModeKafka defines a configuration that differs from the
-    # SampleDevModeSolo one only in that it uses the Kafka-based orderer.
-    SampleDevModeKafka:
-        <<: *ChannelDefaults
-        Orderer:
-            <<: *OrdererDefaults
-            OrdererType: kafka
-            Organizations:
-                - <<: *SampleOrg
-                  Policies:
-                      <<: *SampleOrgPolicies
-                      Admins:
-                          Type: Signature
-                          Rule: "OR('SampleOrg.member')"
-        Application:
-            <<: *ApplicationDefaults
-            Organizations:
-                - <<: *SampleOrg
-                  Policies:
-                      <<: *SampleOrgPolicies
-                      Admins:
-                          Type: Signature
-                          Rule: "OR('SampleOrg.member')"
-        Consortiums:
-            SampleConsortium:
-                Organizations:
-                    - <<: *SampleOrg
-                      Policies:
-                          <<: *SampleOrgPolicies
-                          Admins:
-                              Type: Signature
-                              Rule: "OR('SampleOrg.member')"
-
     # SampleSingleMSPChannel defines a channel with only the sample org as a
     # member. It is designed to be used in conjunction with SampleSingleMSPSolo
     # and SampleSingleMSPKafka orderer profiles.   Note, for channel creation

diff --git a/sampleconfig/configtx.yaml b/sampleconfig/configtx.yaml
@@ -478,20 +478,6 @@ Profiles:
         Organizations:
           - *SampleOrg
 
-  # SampleSingleMSPKafka defines a configuration that differs from the
-  # SampleSingleMSPSolo one only in that it uses the Kafka-based orderer.
-  SampleSingleMSPKafka:
-    <<: *ChannelDefaults
-    Orderer:
-      <<: *OrdererDefaults
-      OrdererType: kafka
-      Organizations:
-        - *SampleOrg
-    Consortiums:
-      SampleConsortium:
-        Organizations:
-          - *SampleOrg
-
   # SampleInsecureSolo defines a configuration which uses the Solo orderer,
   # contains no MSP definitions, and allows all transactions and channel
   # creation requests for the consortium SampleConsortium.
@@ -504,17 +490,6 @@ Profiles:
       SampleConsortium:
         Organizations:
 
-  # SampleInsecureKafka defines a configuration that differs from the
-  # SampleInsecureSolo one only in that it uses the Kafka-based orderer.
-  SampleInsecureKafka:
-    <<: *ChannelDefaults
-    Orderer:
-      <<: *OrdererDefaults
-      OrdererType: kafka
-    Consortiums:
-      SampleConsortium:
-        Organizations:
-
   # SampleDevModeSolo defines a configuration which uses the Solo orderer,
   # contains the sample MSP as both orderer and consortium member, and
   # requires only basic membership for admin privileges. It also defines
@@ -551,44 +526,11 @@ Profiles:
                 Type: Signature
                 Rule: "OR('SampleOrg.member')"
 
-  # SampleDevModeKafka defines a configuration that differs from the
-  # SampleDevModeSolo one only in that it uses the Kafka-based orderer.
-  SampleDevModeKafka:
-    <<: *ChannelDefaults
-    Orderer:
-      <<: *OrdererDefaults
-      OrdererType: kafka
-      Organizations:
-        - <<: *SampleOrg
-          Policies:
-            <<: *SampleOrgPolicies
-            Admins:
-              Type: Signature
-              Rule: "OR('SampleOrg.member')"
-    Application:
-      <<: *ApplicationDefaults
-      Organizations:
-        - <<: *SampleOrg
-          Policies:
-            <<: *SampleOrgPolicies
-            Admins:
-              Type: Signature
-              Rule: "OR('SampleOrg.member')"
-    Consortiums:
-      SampleConsortium:
-        Organizations:
-          - <<: *SampleOrg
-            Policies:
-              <<: *SampleOrgPolicies
-              Admins:
-                Type: Signature
-                Rule: "OR('SampleOrg.member')"
 
   # SampleSingleMSPChannel defines a channel with only the sample org as a
   # member. It is designed to be used in conjunction with SampleSingleMSPSolo
-  # and SampleSingleMSPKafka orderer profiles.   Note, for channel creation
-  # profiles, only the 'Application' section and consortium # name are
-  # considered.
+  # orderer profile. Note, for channel creation profiles, only the
+  # 'Application' section and consortium # name are considered.
   SampleSingleMSPChannel:
     <<: *ChannelDefaults
     Consortium: SampleConsortium