Skip to content

vendor: github.com/containerd/containerd v1.7.25#49251

Merged
tianon merged 2 commits intomoby:masterfrom
thaJeztah:vendor_containerd_1.7.25
Jan 10, 2025
Merged

vendor: github.com/containerd/containerd v1.7.25#49251
tianon merged 2 commits intomoby:masterfrom
thaJeztah:vendor_containerd_1.7.25

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jan 10, 2025 •
edited
Loading

vendor: github.com/containerd/containerd/api v1.8.0

full diff: full diff: https://github.com/containerd/containerd/compare/api/v1.7.19..api/v1.8.0

vendor: github.com/containerd/containerd v1.7.25

full diff: containerd/containerd@v1.7.24...v1.7.25

- Description for the changelog



- A picture of a cute animal (not mandatory but encouraged)

    

  
  



      


          

          
  
  

    
  
    
    

  

  

  



                    

          
        





  





    



      

  
        





      

  
            


    

    

      
    

    


      


          @thaJeztah
thaJeztah




          added this to the 
  28.0.0 milestone


      Jan 10, 2025

    

  



    

    

      
    

    


      


          @thaJeztah
thaJeztah




              self-assigned this


      Jan 10, 2025

    

  



  

  

    
  


  

      


    @thaJeztah
thaJeztah



    mentioned this pull request
    
      Jan 10, 2025
    





  


  

      
   Merged

  







  









      

  
      



  

  @thaJeztah






  



    

      

  

    

      

          
    
    

  


        
            
  
      
              Copy link

  

              
  
      
                Copy Markdown

  

        
      

    


    

        

  
  Member


        

  Author


    

  


  

    

      
          
      

      
            thaJeztah
  

      

      

      commented


        Jan 10, 2025


      
    


  





      


        



  
    

      
          
Oh; interesting; some bits deprecated;


INFO [runner] linters took 1m20.753431948s with stages: goanalysis_metalinter: 1m20.636123112s 
libcontainerd/remote/client.go:60:17: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
	v2runcoptions *v2runcoptions.Options
	               ^
libcontainerd/remote/client.go:143:31: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
	if x, ok := runtimeOptions.(*v2runcoptions.Options); ok {
	                             ^
libcontainerd/remote/client.go:211:44: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
				opts := proto.Clone(c.v2runcoptions).(*v2runcoptions.Options)
				                                       ^
libcontainerd/remote/client.go:414:17: SA1019: v2runcoptions.CheckpointOptions is deprecated: use [api.CheckpointOptions] instead (staticcheck)
			r.Options = &v2runcoptions.CheckpointOptions{}
			             ^
libcontainerd/remote/client.go:418:9: SA1019: v2runcoptions.CheckpointOptions is deprecated: use [api.CheckpointOptions] instead (staticcheck)
		case *v2runcoptions.CheckpointOptions:
		      ^
libcontainerd/shimopts/convert.go:21:10: SA1019: runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
		out = &runcoptions.Options{}
		       ^
daemon/info_unix.go:390:25: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
	shimopts, ok := opts.(*v2runcoptions.Options)
	                       ^
daemon/runtime_unix.go:60:10: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
		Opts: &v2runcoptions.Options{
		       ^
daemon/runtime_unix_test.go:246:49: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
	configdOpts := proto.Clone(stockRuntime.Opts.(*v2runcoptions.Options)).(*v2runcoptions.Options)
	                                               ^
daemon/runtime_unix_test.go:307:12: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
				Opts: &v2runcoptions.Options{IoUid: 42},
				       ^
daemon/runtime_unix_test.go:339:31: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
					cmpopts.IgnoreUnexported(v2runcoptions.Options{}),
					                         ^
daemon/runtime_unix_test.go:352:26: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
		runcopts, ok := opts.(*v2runcoptions.Options)
		                       ^
daemon/runtime_unix_test.go:429:21: SA1019: v2runcoptions.Options is deprecated: use [api.Options] instead (staticcheck)
			binary := opts.(*v2runcoptions.Options).BinaryName
			                 ^



      		
    

  





        


            

            
            

              
            

        

      


      

            
  
  

    
  
    
    

  

  

  


    












      

  
        





      

  
          

  
  

  
      @thaJeztah
  thaJeztah


        force-pushed
    the
        
      
  vendor_containerd_1.7.25


    
 branch
    from
    8556057    to
    ad86017      
    Compare
  



    January 10, 2025 12:10    
    









      

  
        





      

  
        





      

  
          

  
  

  
      @thaJeztah
  thaJeztah


        marked this pull request as ready for review

    January 10, 2025 22:32    
    









      

  
      



  

  @thaJeztah






  



    

      

  

    

      

          
    
    

  


        
            
  
      
              Copy link

  

              
  
      
                Copy Markdown

  

        
      

    


    

        

  
  Member


        

  Author


    

  


  

    

      
          
      

      
            thaJeztah
  

      

      

      commented


        Jan 10, 2025


      
    


  





      


        



  
    

      
          
LOL, and moving out of draft made Jenkins wake up to run CI again, well 🤷‍♂️


      		
    

  





        


            

            
            

              
            

        

      


      

            
  
  

    
  
    
    

  

  

  


    












      

  
          
 
  

    
  

  



        @tianon
  tianon



        merged commit 4ee19fa
      into

      
  
    moby:master
  


    Jan 10, 2025

  












      

  
      



  

  @tianon






  



    

      

  

    

      

          
    
    

  


        
            
  
      
              Copy link

  

              
  
      
                Copy Markdown

  

        
      

    


    

        

  
  Member


        

    

  


  

    

      
          
      

      
            tianon
  

      

      

      commented


        Jan 10, 2025


      
    


  





      


        



  
    

      
          
With apologies to Jenkins, no.


      		
    

  





        


            

            
            

              
            

        

      


      

            
  
  

    
  
    
    

  

  

  


    












      

  
          

  
  

  
      @thaJeztah
  thaJeztah


    
    deleted the
    
      
        vendor_containerd_1.7.25
    
    branch

    January 10, 2025 22:38    
    













  
  

    

      

  










  








  
      

  
    Sign up for free
    to join this conversation on GitHub.
    Already have an account?
    Sign in to comment


  










      

  

    
    

    

  

    Reviewers
  


    


      

  

    


  
      @tianon
  
    tianon


    
      
        
      
    
    tianon approved these changes



      

  

    


  
      @dmcgowan
  
    dmcgowan


    
      
        
      
    
    dmcgowan approved these changes




      






    
    
    

    

  


      
  

    Assignees
  



        


      

        


  
      @thaJeztah
  
    thaJeztah
    

      








      


  


  

    Labels
  



    

      

    area/dependencies

  

    area/runtime

  Runtime
  

    status/2-code-review









      

  

    

        

    Projects
  


        




    None yet




  



      


  

    
  

    Milestone
  


      
    
  
    28.0.0
  





    
      
          


  

    

      
        

          
  

    Development
  



            


Successfully merging this pull request may close these issues.





  
  



      
    

  




      

    

  
        

  

    

      3 participants
    

    

        
          @thaJeztah 
        
          @tianon 
        
          @dmcgowan