Merge pull request #1562 from kramvan1/remove-deprecated-os-label

beta.kubernetes.io/os deprecated since v1.14, removed in v1.19
operator-framework · Jun 11, 2020 · 21d67c1 · 21d67c1
2 parents 3365cf5 + 5ffe1d3
commit 21d67c1
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/deploy/chart/values.yaml b/deploy/chart/values.yaml
@@ -15,7 +15,7 @@ olm:
   service:
     internalPort: 8080
   nodeSelector:
-    beta.kubernetes.io/os: linux
+    kubernetes.io/os: linux
   resources:
     requests:
      cpu: 10m
@@ -30,7 +30,7 @@ catalog:
   service:
     internalPort: 8080
   nodeSelector:
-    beta.kubernetes.io/os: linux
+    kubernetes.io/os: linux
   resources:
     requests:
      cpu: 10m
@@ -44,7 +44,7 @@ package:
   service:
     internalPort: 5443
   nodeSelector:
-    beta.kubernetes.io/os: linux
+    kubernetes.io/os: linux
   resources:
     requests:
      cpu: 10m

diff --git a/deploy/ocp/values.yaml b/deploy/ocp/values.yaml
@@ -15,7 +15,7 @@ olm:
   service:
     internalPort: 8080
   nodeSelector:
-    beta.kubernetes.io/os: linux
+    kubernetes.io/os: linux
     node-role.kubernetes.io/master: ""
   tolerations:
   - key: node-role.kubernetes.io/master
@@ -43,7 +43,7 @@ catalog:
   service:
     internalPort: 8080
   nodeSelector:
-    beta.kubernetes.io/os: linux
+    kubernetes.io/os: linux
     node-role.kubernetes.io/master: ""
   tolerations:
   - key: node-role.kubernetes.io/master
@@ -69,7 +69,7 @@ package:
   service:
     internalPort: 5443
   nodeSelector:
-    beta.kubernetes.io/os: linux
+    kubernetes.io/os: linux
     node-role.kubernetes.io/master: ""
   tolerations:
   - key: node-role.kubernetes.io/master

diff --git a/deploy/upstream/quickstart/olm.yaml b/deploy/upstream/quickstart/olm.yaml
@@ -85,7 +85,7 @@ spec:
               port: 8080
           terminationMessagePolicy: FallbackToLogsOnError
           env:
-        
+
           - name: OPERATOR_NAMESPACE
             valueFrom:
               fieldRef:
@@ -96,10 +96,10 @@ spec:
             requests:
               cpu: 10m
               memory: 160Mi
-          
-      
+
+
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -148,15 +148,15 @@ spec:
               port: 8080
           terminationMessagePolicy: FallbackToLogsOnError
           env:
-          
+
           resources:
             requests:
               cpu: 10m
               memory: 80Mi
-          
-      
+
+
       nodeSelector:
-        beta.kubernetes.io/os: linux
+        kubernetes.io/os: linux
 ---
 kind: ClusterRole
 apiVersion: rbac.authorization.k8s.io/v1
@@ -285,7 +285,7 @@ spec:
             spec:
               serviceAccountName: olm-operator-serviceaccount
               nodeSelector:
-                beta.kubernetes.io/os: linux
+                kubernetes.io/os: linux
               containers:
               - name: packageserver
                 command:

diff --git a/doc/design/building-your-csv.md b/doc/design/building-your-csv.md
@@ -202,7 +202,7 @@ An APIService is uniquely identified by the group-version it provides and can be
 **Kind**: A kind that the APIService is expected to provide.
 
 **DeploymentName**:
-Name of the deployment defined by your CSV that corresponds to your APIService (required for owned APIServices). During the CSV pending phase, the OLM Operator will search your CSV's InstallStrategy for a deployment spec with a matching name, and if not found, will not transition the CSV to the install ready phase.  
+Name of the deployment defined by your CSV that corresponds to your APIService (required for owned APIServices). During the CSV pending phase, the OLM Operator will search your CSV's InstallStrategy for a deployment spec with a matching name, and if not found, will not transition the CSV to the install ready phase.
 
 **Resources**:
 Your APIServices will own one or more types of Kubernetes objects. These are listed in the resources section to inform your end-users of the objects they might need to troubleshoot or how to connect to the application, such as the Service or Ingress rule that exposes a database.
@@ -345,7 +345,7 @@ Here’s a full example:
                 imagePullSecrets:
                   - name: ''
                 nodeSelector:
-                  beta.kubernetes.io/os: linux
+                  kubernetes.io/os: linux
                 serviceAccountName: example-operator
       permissions:
         - serviceAccountName: example-operator

diff --git a/pkg/controller/registry/reconciler/reconciler.go b/pkg/controller/registry/reconciler/reconciler.go
@@ -143,7 +143,7 @@ func Pod(source *v1alpha1.CatalogSource, name string, image string, labels map[s
 				},
 			},
 			NodeSelector: map[string]string{
-				"beta.kubernetes.io/os": "linux",
+				"kubernetes.io/os": "linux",
 			},
 		},
 	}

diff --git a/pkg/controller/registry/reconciler/reconciler_test.go b/pkg/controller/registry/reconciler/reconciler_test.go
@@ -15,7 +15,7 @@ func TestPodNodeSelector(t *testing.T) {
 		},
 	}
 
-	key := "beta.kubernetes.io/os"
+	key := "kubernetes.io/os"
 	value := "linux"
 
 	gotCatSrcPod := Pod(catsrc, "hello", "busybox", map[string]string{}, int32(0), int32(0))

diff --git a/pkg/package-server/provider/registry_test.go b/pkg/package-server/provider/registry_test.go
diff --git a/...testdata/manifests/prometheus/0.22.2/prometheusoperator.0.22.2.clusterserviceversion.yaml b/...testdata/manifests/prometheus/0.22.2/prometheusoperator.0.22.2.clusterserviceversion.yaml
@@ -184,7 +184,7 @@ spec:
                   allowPrivilegeEscalation: false
                   readOnlyRootFilesystem: true
               nodeSelector:
-                beta.kubernetes.io/os: linux
+                kubernetes.io/os: linux
   maturity: beta
   version: 0.22.2
   customresourcedefinitions: