Merge pull request #257 from hbagdi/feat/drop-min-tls

tls: drop tls.MinimumVersion in favor of tls.Options
kubernetes-sigs · Aug 11, 2020 · 54286b5 · 54286b5
2 parents 35e446a + b1f65a7
commit 54286b5
Show file tree

Hide file tree

Showing 7 changed files with 147 additions and 272 deletions.
diff --git a/apis/v1alpha1/generated.pb.go b/apis/v1alpha1/generated.pb.go
diff --git a/apis/v1alpha1/generated.proto b/apis/v1alpha1/generated.proto
diff --git a/apis/v1alpha1/tlsconfig_types.go b/apis/v1alpha1/tlsconfig_types.go
@@ -15,17 +15,6 @@ limitations under the License.
 
 package v1alpha1
 
-const (
-	// TLS1_0 denotes the TLS v1.0.
-	TLS1_0 = "TLS1_0"
-	// TLS1_1 denotes the TLS v1.1.
-	TLS1_1 = "TLS1_1"
-	// TLS1_2 denotes the TLS v1.2.
-	TLS1_2 = "TLS1_2"
-	// TLS1_3 denotes the TLS v1.3.
-	TLS1_3 = "TLS1_3"
-)
-
 // TLSConfig describes a TLS configuration.
 //
 // References
@@ -50,17 +39,6 @@ type TLSConfig struct {
 	//
 	// +required
 	CertificateRefs []CertificateObjectReference `json:"certificateRefs,omitempty" protobuf:"bytes,1,rep,name=certificateRefs"`
-	// MinimumVersion of TLS allowed. It is recommended to use one of
-	// the TLS_* constants above. Note: MinimumVersion is not strongly
-	// typed to allow implementation-specific versions to be used without
-	// requiring updates to the API types. String must be of the form
-	// "<protocol><major>_<minor>".
-	//
-	// Support: Core for TLS1_{1,2,3}. Implementation-specific for all other
-	// values.
-	//
-	// +optional
-	MinimumVersion *string `json:"minimumVersion" protobuf:"bytes,2,opt,name=minimumVersion"`
 	// Options are a list of key/value pairs to give extended options
 	// to the provider.
 	//

diff --git a/apis/v1alpha1/zz_generated.deepcopy.go b/apis/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/networking.x-k8s.io_gateways.yaml b/config/crd/bases/networking.x-k8s.io_gateways.yaml
@@ -198,9 +198,6 @@ spec:
                             - name
                             type: object
                           type: array
-                        minimumVersion:
-                          description: "MinimumVersion of TLS allowed. It is recommended to use one of the TLS_* constants above. Note: MinimumVersion is not strongly typed to allow implementation-specific versions to be used without requiring updates to the API types. String must be of the form \"<protocol><major>_<minor>\". \n Support: Core for TLS1_{1,2,3}. Implementation-specific for all other values."
-                          type: string
                         options:
                           additionalProperties:
                             type: string

diff --git a/docs-src/spec.md b/docs-src/spec.md
@@ -2776,24 +2776,6 @@ Support: Implementation-specific (Other resource types)</p>
 </tr>
 <tr>
 <td>
-<code>minimumVersion</code></br>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>MinimumVersion of TLS allowed. It is recommended to use one of
-the TLS<em>* constants above. Note: MinimumVersion is not strongly
-typed to allow implementation-specific versions to be used without
-requiring updates to the API types. String must be of the form
-&ldquo;<protocol><major></em><minor>&rdquo;.</p>
-<p>Support: Core for TLS1_{1,2,3}. Implementation-specific for all other
-values.</p>
-</td>
-</tr>
-<tr>
-<td>
 <code>options</code></br>
 <em>
 map[string]string

diff --git a/docs/spec/index.html b/docs/spec/index.html
@@ -1874,7 +1874,7 @@ <h3 id="networking.x-k8s.io/v1alpha1.HTTPRouteHost">HTTPRouteHost
 a domain name prefixed with a single wildcard label (e.g. &ldquo;<em>.example.com&rdquo;).
 The wildcard character &lsquo;</em>&rsquo; must appear by itself as the first DNS
 label and matches only a single label.
-You cannot have a wildcard label by itself (e.g. Host == &ldquo;<em>&rdquo;).
+You cannot have a wildcard label by itself (e.g. Host == &ldquo;*&rdquo;).
 Requests will be matched against the Host field in the following order:
 1. If Host is precise, the request matches this rule if
 the http host header is equal to Host.
@@ -3101,24 +3101,6 @@ <h3 id="networking.x-k8s.io/v1alpha1.TLSConfig">TLSConfig
 </tr>
 <tr>
 <td>
-<code>minimumVersion</code></br>
-<em>
-string
-</em>
-</td>
-<td>
-<em>(Optional)</em>
-<p>MinimumVersion of TLS allowed. It is recommended to use one of
-the TLS<em></em> constants above. Note: MinimumVersion is not strongly
-typed to allow implementation-specific versions to be used without
-requiring updates to the API types. String must be of the form
-&ldquo;<protocol><major></em><minor>&rdquo;.</p>
-<p>Support: Core for TLS1_{1,2,3}. Implementation-specific for all other
-values.</p>
-</td>
-</tr>
-<tr>
-<td>
 <code>options</code></br>
 <em>
 map[string]string