-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
cri: propagate deprecation list to runtime status
Propagate the deprecation list to CRI runtime conditions. The propagated conditions are visible via `crictl info`, but not visible via `kubectl get nodes -o yaml` yet, although the CRI API says "These conditions will be exposed to users to help them understand the status of the system". https://github.com/kubernetes/cri-api/blob/v0.29.1/pkg/apis/runtime/v1/api.proto#L1505-L1509 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp> (cherry picked from commit 1b3a96d) (cherry-pick was not clean) Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
- Loading branch information
1 parent
8e86a0b
commit c79ffa2
Showing
3 changed files
with
101 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
Copyright The containerd Authors. | ||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
http://www.apache.org/licenses/LICENSE-2.0 | ||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package server | ||
|
||
import ( | ||
"testing" | ||
|
||
"github.com/containerd/containerd/api/services/introspection/v1" | ||
"github.com/stretchr/testify/assert" | ||
runtime "k8s.io/cri-api/pkg/apis/runtime/v1" | ||
) | ||
|
||
func TestRuntimeConditionContainerdHasNoDeprecationWarnings(t *testing.T) { | ||
deprecations := []*introspection.DeprecationWarning{ | ||
{ | ||
ID: "io.containerd.deprecation/foo", | ||
Message: "foo", | ||
}, | ||
} | ||
|
||
cond, err := runtimeConditionContainerdHasNoDeprecationWarnings(deprecations, nil) | ||
assert.NoError(t, err) | ||
assert.Equal(t, &runtime.RuntimeCondition{ | ||
Type: ContainerdHasNoDeprecationWarnings, | ||
Status: false, | ||
Reason: ContainerdHasDeprecationWarnings, | ||
Message: `{"io.containerd.deprecation/foo":"foo"}`, | ||
}, cond) | ||
|
||
cond, err = runtimeConditionContainerdHasNoDeprecationWarnings(deprecations, []string{"io.containerd.deprecation/foo"}) | ||
assert.NoError(t, err) | ||
assert.Equal(t, &runtime.RuntimeCondition{ | ||
Type: ContainerdHasNoDeprecationWarnings, | ||
Status: true, | ||
}, cond) | ||
} |