Merge pull request #320 from justinsb/deployments_should_go_ready

mockkubeapiserver: deployments should become healthy

Author: k8s-ci-robot

applylib/go.mod

@@ -8,9 +8,9 @@ go 1.19
 
 require (
 	github.com/google/go-cmp v0.5.9
-	k8s.io/api v0.26.0
+	k8s.io/api v0.26.2
 	k8s.io/apimachinery v0.26.2
-	k8s.io/client-go v0.26.0
+	k8s.io/client-go v0.26.2
 	k8s.io/klog/v2 v2.90.1
 	sigs.k8s.io/controller-runtime v0.14.1
 	sigs.k8s.io/kubebuilder-declarative-pattern/mockkubeapiserver v0.0.0-20221021151406-9bd3fb842119

applylib/go.sum

@@ -483,13 +483,13 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.26.0 h1:IpPlZnxBpV1xl7TGk/X6lFtpgjgntCg8PJ+qrPHAC7I=
-k8s.io/api v0.26.0/go.mod h1:k6HDTaIFC8yn1i6pSClSqIwLABIcLV9l5Q4EcngKnQg=
+k8s.io/api v0.26.2 h1:dM3cinp3PGB6asOySalOZxEG4CZ0IAdJsrYZXE/ovGQ=
+k8s.io/api v0.26.2/go.mod h1:1kjMQsFE+QHPfskEcVNgL3+Hp88B80uj0QtSOlj8itU=
 k8s.io/apiextensions-apiserver v0.26.0 h1:Gy93Xo1eg2ZIkNX/8vy5xviVSxwQulsnUdQ00nEdpDo=
 k8s.io/apimachinery v0.26.2 h1:da1u3D5wfR5u2RpLhE/ZtZS2P7QvDgLZTi9wrNZl/tQ=
 k8s.io/apimachinery v0.26.2/go.mod h1:ats7nN1LExKHvJ9TmwootT00Yz05MuYqPXEXaVeOy5I=
-k8s.io/client-go v0.26.0 h1:lT1D3OfO+wIi9UFolCrifbjUUgu7CpLca0AD8ghRLI8=
-k8s.io/client-go v0.26.0/go.mod h1:I2Sh57A79EQsDmn7F7ASpmru1cceh3ocVT9KlX2jEZg=
+k8s.io/client-go v0.26.2 h1:s1WkVujHX3kTp4Zn4yGNFK+dlDXy1bAAkIl+cFAiuYI=
+k8s.io/client-go v0.26.2/go.mod h1:u5EjOuSyBa09yqqyY7m3abZeovO/7D/WehVVlZ2qcqU=
 k8s.io/klog/v2 v2.90.1 h1:m4bYOKall2MmOiRaR1J+We67Do7vm9KiQVlT96lnHUw=
 k8s.io/klog/v2 v2.90.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
 k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 h1:+70TFaan3hfJzs+7VK2o+OGxg8HsuBr/5f6tVAjDu6E=

dev/test

@@ -0,0 +1,42 @@
+#!/bin/bash
+
+# Copyright 2022 The Kubernetes 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.
+
+
+# CI script to run all the test commands
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+# cd to the repo root
+REPO_ROOT=$(git rev-parse --show-toplevel)
+cd "${REPO_ROOT}"
+
+set -x
+
+pushd mockkubeapiserver
+CGO_ENABLED=0 go test -count=1 -v ./...
+popd
+
+pushd applylib
+CGO_ENABLED=0 go test -count=1 -v ./...
+popd
+
+CGO_ENABLED=0 go test -count=1 -v ./...
+
+pushd examples/guestbook-operator
+CGO_ENABLED=0 go test -count=1 -v ./...
+popd

hack/ci/test.sh

@@ -37,9 +37,11 @@ chmod +x bin/kubectl
 export PATH="${REPO_ROOT}/bin:$PATH"
 echo "kubectl version is $(kubectl version --client)"
 
-export GO111MODULE=on
-
-go test -v -count=1 sigs.k8s.io/kubebuilder-declarative-pattern/pkg/...
-
-cd examples/guestbook-operator
-go test sigs.k8s.io/kubebuilder-declarative-pattern/examples/guestbook-operator/controllers/...
+# Run with a go workspace
+rm -f go.work go.work.sum
+go work init .
+go work use applylib
+go work use mockkubeapiserver
+go work use examples/guestbook-operator
+
+dev/test

mockkubeapiserver/controllers.go

@@ -32,6 +32,10 @@ func (s *MemoryStorage) objectChanged(u *unstructured.Unstructured) {
 	switch gvk.GroupKind() {
 	case schema.GroupKind{Kind: "Namespace"}:
 		s.namespaceChanged(u)
+	case schema.GroupKind{Group: "apps", Kind: "Deployment"}:
+		if err := s.deploymentChanged(u); err != nil {
+			klog.Fatalf("could not update deployment status: %v", err)
+		}
 	case schema.GroupKind{Group: "apiextensions.k8s.io", Kind: "CustomResourceDefinition"}:
 		if err := s.crdChanged(u); err != nil {
 			klog.Warningf("crd change was invalid: %v", err)
@@ -150,3 +154,60 @@ func (s *MemoryStorage) crdChanged(u *unstructured.Unstructured) error {
 	}
 	return nil
 }
+
+func (s *MemoryStorage) deploymentChanged(u *unstructured.Unstructured) error {
+	// So that deployments become ready, we immediately update the status.
+	// We could do something better here, like e.g. a 1 second pause before changing the status
+	statusObj := u.Object["status"]
+	if statusObj == nil {
+		statusObj = make(map[string]interface{})
+		u.Object["status"] = statusObj
+	}
+	status, ok := statusObj.(map[string]interface{})
+	if !ok {
+		return fmt.Errorf("status was of unexpected type %T", statusObj)
+	}
+
+	generation := u.GetGeneration()
+	if generation == 0 {
+		generation = 1
+		u.SetGeneration(generation)
+	}
+
+	replicasVal, _, err := unstructured.NestedFieldNoCopy(u.Object, "spec", "replicas")
+	if err != nil {
+		return fmt.Errorf("error getting spec.replicas: %w", err)
+	}
+	replicas := int64(0)
+	switch replicasVal := replicasVal.(type) {
+	case int64:
+		replicas = replicasVal
+	case float64:
+		replicas = int64(replicasVal)
+	default:
+		return fmt.Errorf("unhandled type for spec.replicas %T", replicasVal)
+	}
+
+	var conditions []interface{}
+	conditions = append(conditions, map[string]interface{}{
+		"type":   "Available",
+		"status": "True",
+		"reason": "MinimumReplicasAvailable",
+	})
+	conditions = append(conditions, map[string]interface{}{
+		"type":   "Progressing",
+		"status": "True",
+		"reason": "NewReplicaSetAvailable",
+	})
+	status["conditions"] = conditions
+
+	status["availableReplicas"] = replicas
+	status["readyReplicas"] = replicas
+	status["replicas"] = replicas
+	status["updatedReplicas"] = replicas
+
+	observedGeneration := generation
+	status["observedGeneration"] = observedGeneration
+
+	return nil
+}