@@ -59,7 +59,7 @@ var aerospikeConfigWithSecurityWithQuota = &asdbv1.AerospikeConfigSpec{
59
59
},
60
60
}
61
61
62
- var _ = Describe (
62
+ var _ = FDescribe (
63
63
"AccessControl" , func () {
64
64
ctx := goctx .TODO ()
65
65
@@ -1576,16 +1576,6 @@ var _ = Describe(
1576
1576
},
1577
1577
}
1578
1578
1579
- aerospikeConfigSpec , err = NewAerospikeConfSpec (latestImage )
1580
- if err != nil {
1581
- Fail (
1582
- fmt .Sprintf (
1583
- "Invalid Aerospike Config Spec: %v" ,
1584
- err ,
1585
- ),
1586
- )
1587
- }
1588
-
1589
1579
aerospikeConfigSpec .setSecurity (true )
1590
1580
1591
1581
aeroCluster = getAerospikeClusterSpecWithAccessControl (
@@ -1662,16 +1652,6 @@ var _ = Describe(
1662
1652
Fail ("Security should be enabled" )
1663
1653
}
1664
1654
1665
- aerospikeConfigSpec , err = NewAerospikeConfSpec (latestImage )
1666
- if err != nil {
1667
- Fail (
1668
- fmt .Sprintf (
1669
- "Invalid Aerospike Config Spec: %v" ,
1670
- err ,
1671
- ),
1672
- )
1673
- }
1674
-
1675
1655
aerospikeConfigSpec .setSecurity (false )
1676
1656
accessControl = nil
1677
1657
@@ -1748,16 +1728,6 @@ var _ = Describe(
1748
1728
},
1749
1729
}
1750
1730
1751
- aerospikeConfigSpec , err = NewAerospikeConfSpec (latestImage )
1752
- if err != nil {
1753
- Fail (
1754
- fmt .Sprintf (
1755
- "Invalid Aerospike Config Spec: %v" ,
1756
- err ,
1757
- ),
1758
- )
1759
- }
1760
-
1761
1731
aerospikeConfigSpec .setSecurity (true )
1762
1732
1763
1733
aeroCluster = getAerospikeClusterSpecWithAccessControl (
@@ -1783,7 +1753,7 @@ var _ = Describe(
1783
1753
1784
1754
Expect (err ).To (HaveOccurred ())
1785
1755
Expect (err .Error ()).Should (ContainSubstring (
1786
- "status has not yet been updated with the current configuration " ))
1756
+ "security enablement is in progress " ))
1787
1757
1788
1758
Eventually (func (g Gomega ) {
1789
1759
err := testAccessControlReconcile (aeroCluster , ctx )
@@ -1967,16 +1937,6 @@ var _ = Describe(
1967
1937
},
1968
1938
}
1969
1939
1970
- aerospikeConfigSpec , err = NewAerospikeConfSpec (latestImage )
1971
- if err != nil {
1972
- Fail (
1973
- fmt .Sprintf (
1974
- "Invalid Aerospike Config Spec: %v" ,
1975
- err ,
1976
- ),
1977
- )
1978
- }
1979
-
1980
1940
aerospikeConfigSpec .setSecurity (true )
1981
1941
aerospikeConfigSpec .setEnableQuotas (true )
1982
1942
@@ -2040,15 +2000,6 @@ var _ = Describe(
2040
2000
},
2041
2001
}
2042
2002
2043
- aerospikeConfigSpec , err = NewAerospikeConfSpec (latestImage )
2044
- if err != nil {
2045
- Fail (
2046
- fmt .Sprintf (
2047
- "Invalid Aerospike Config Spec: %v" ,
2048
- err ,
2049
- ),
2050
- )
2051
- }
2052
2003
aerospikeConfigSpec .setSecurity (true )
2053
2004
aerospikeConfigSpec .setEnableQuotas (false )
2054
2005
@@ -2114,15 +2065,6 @@ var _ = Describe(
2114
2065
},
2115
2066
}
2116
2067
2117
- aerospikeConfigSpec , err = NewAerospikeConfSpec (latestImage )
2118
- if err != nil {
2119
- Fail (
2120
- fmt .Sprintf (
2121
- "Invalid Aerospike Config Spec: %v" ,
2122
- err ,
2123
- ),
2124
- )
2125
- }
2126
2068
aerospikeConfigSpec .setSecurity (true )
2127
2069
aerospikeConfigSpec .setEnableQuotas (false )
2128
2070
0 commit comments