Nail/fission-src
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Crds update (#2033)

Browse Source 
* Add code generated using latest code-generator

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Update client-go and respective dependencies to v0.19.2

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Upgrading CRD version

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Minor changes

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Resolved client-go calls as per new generated code

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Function validations fix

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Fix environment and package validations

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Add basic validation to all CRDs

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Remove CRD installation related code

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Modify GHA for CRD installation

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Fix Package and HTTPTrigger validations

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Change Go version in CI to 1.15

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Style: kubebuilder marker change

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Fix test with deprecated fields

Signed-off-by: Harsh Thakur <harshthakur9030@gmail.com>

* Update kind node image to v1.16.15 in CI

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Update kind node image to v1.19.11 in CI

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Replace context Background with TODO for future implementation

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Optimize initial CRD check code

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Use Get call only to check CRDs

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

* Add kustomize for CRD apply

Signed-off-by: Sanket Sudake <sanketsudake@gmail.com>

Co-authored-by: Sanket Sudake <sanketsudake@gmail.com>
This commit is contained in:
Harsh Thakur
2021-05-26 15:07:03 +05:30
committed by GitHub
co-authored by Sanket Sudake
parent a9c56e5bb2
commit 1e0baf5f6c
108 changed files with 10713 additions and 2340 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/api.go
+4 -3
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"fmt"
"net/http"
"os"
@@ -134,14 +135,14 @@ func (api *API) createNsIfNotExists(ns string) error {
return nil
}
_, err := api.kubernetesClient.CoreV1().Namespaces().Get(ns, metav1.GetOptions{})
_, err := api.kubernetesClient.CoreV1().Namespaces().Get(context.TODO(), ns, metav1.GetOptions{})
if err != nil && kerrors.IsNotFound(err) {
ns := &apiv1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: ns,
},
}
_, err = api.kubernetesClient.CoreV1().Namespaces().Create(ns)
_, err = api.kubernetesClient.CoreV1().Namespaces().Create(context.TODO(), ns, metav1.CreateOptions{})
}
return err
@@ -183,7 +184,7 @@ func (api *API) HealthHandler(w http.ResponseWriter, r *http.Request) {
func (api *API) GetSvcName(w http.ResponseWriter, r *http.Request) {
appLabelSelector := "application=" + r.URL.Query().Get("application")
services, err := api.kubernetesClient.CoreV1().Services(podNamespace).List(metav1.ListOptions{
services, err := api.kubernetesClient.CoreV1().Services(podNamespace).List(context.TODO(), metav1.ListOptions{
LabelSelector: appLabelSelector,
})
if err != nil || len(services.Items) > 1 || len(services.Items) == 0 {
pkg/controller/api_test.go
+4 -3
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"flag"
"fmt"
"io/ioutil"
@@ -359,13 +360,13 @@ func TestMain(m *testing.M) {
// testNS isolation for running multiple CI builds concurrently.
testNS = uuid.NewV4().String()
_, err = kubeClient.CoreV1().Namespaces().Create(&v1.Namespace{
_, err = kubeClient.CoreV1().Namespaces().Create(context.TODO(), &v1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: testNS,
},
})
}, metav1.CreateOptions{})
panicIf(err)
defer panicIf(kubeClient.CoreV1().Namespaces().Delete(testNS, nil))
defer panicIf(kubeClient.CoreV1().Namespaces().Delete(context.TODO(), testNS, metav1.DeleteOptions{}))
config := zap.NewDevelopmentConfig()
config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
pkg/controller/canaryConfigApi.go
+6 -5
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
@@ -122,7 +123,7 @@ func (a *API) CanaryConfigApiCreate(w http.ResponseWriter, r *http.Request) {
return
}
canaryCfgNew, err := a.fissionClient.CoreV1().CanaryConfigs(canaryCfg.ObjectMeta.Namespace).Create(&canaryCfg)
canaryCfgNew, err := a.fissionClient.CoreV1().CanaryConfigs(canaryCfg.ObjectMeta.Namespace).Create(context.TODO(), &canaryCfg, metav1.CreateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -153,7 +154,7 @@ func (a *API) CanaryConfigApiGet(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
canaryCfg, err := a.fissionClient.CoreV1().CanaryConfigs(ns).Get(name, metav1.GetOptions{})
canaryCfg, err := a.fissionClient.CoreV1().CanaryConfigs(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -180,7 +181,7 @@ func (a *API) CanaryConfigApiList(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
canaryCfgs, err := a.fissionClient.CoreV1().CanaryConfigs(ns).List(metav1.ListOptions{})
canaryCfgs, err := a.fissionClient.CoreV1().CanaryConfigs(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -215,7 +216,7 @@ func (a *API) CanaryConfigApiUpdate(w http.ResponseWriter, r *http.Request) {
return
}
canayCfgNew, err := a.fissionClient.CoreV1().CanaryConfigs(c.ObjectMeta.Namespace).Update(&c)
canayCfgNew, err := a.fissionClient.CoreV1().CanaryConfigs(c.ObjectMeta.Namespace).Update(context.TODO(), &c, metav1.UpdateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -244,7 +245,7 @@ func (a *API) CanaryConfigApiDelete(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
err := a.fissionClient.CoreV1().CanaryConfigs(ns).Delete(name, &metav1.DeleteOptions{})
err := a.fissionClient.CoreV1().CanaryConfigs(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/configmapApi.go
+2 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"net/http"
"github.com/gorilla/mux"
@@ -32,7 +33,7 @@ func (a *API) ConfigMapExists(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
_, err := a.kubernetesClient.CoreV1().ConfigMaps(ns).Get(name, metav1.GetOptions{})
_, err := a.kubernetesClient.CoreV1().ConfigMaps(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.logger.Error("error getting config map", zap.Error(err), zap.String("config_map_name", name), zap.String("namespace", ns))
a.respondWithError(w, err)
pkg/controller/controller.go
+1 -1
View File
@@ -34,7 +34,7 @@ func Start(logger *zap.Logger, port int, unitTestFlag bool) {
err = crd.EnsureFissionCRDs(cLogger, apiExtClient)
if err != nil {
cLogger.Fatal("failed to create fission CRDs", zap.Error(err))
cLogger.Fatal("failed to find fission CRDs", zap.Error(err))
}
err = fc.WaitForCRDs()
pkg/controller/environmentApi.go
+6 -5
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"encoding/json"
"io/ioutil"
"net/http"
@@ -105,7 +106,7 @@ func (a *API) EnvironmentApiList(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceAll
}
envs, err := a.fissionClient.CoreV1().Environments(ns).List(metav1.ListOptions{})
envs, err := a.fissionClient.CoreV1().Environments(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -142,7 +143,7 @@ func (a *API) EnvironmentApiCreate(w http.ResponseWriter, r *http.Request) {
return
}
enew, err := a.fissionClient.CoreV1().Environments(env.ObjectMeta.Namespace).Create(&env)
enew, err := a.fissionClient.CoreV1().Environments(env.ObjectMeta.Namespace).Create(context.TODO(), &env, metav1.CreateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -167,7 +168,7 @@ func (a *API) EnvironmentApiGet(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
env, err := a.fissionClient.CoreV1().Environments(ns).Get(name, metav1.GetOptions{})
env, err := a.fissionClient.CoreV1().Environments(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -205,7 +206,7 @@ func (a *API) EnvironmentApiUpdate(w http.ResponseWriter, r *http.Request) {
return
}
enew, err := a.fissionClient.CoreV1().Environments(env.ObjectMeta.Namespace).Update(&env)
enew, err := a.fissionClient.CoreV1().Environments(env.ObjectMeta.Namespace).Update(context.TODO(), &env, metav1.UpdateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -229,7 +230,7 @@ func (a *API) EnvironmentApiDelete(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
err := a.fissionClient.CoreV1().Environments(ns).Delete(name, &metav1.DeleteOptions{})
err := a.fissionClient.CoreV1().Environments(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/functionApi.go
+9 -8
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"encoding/json"
"fmt"
"io"
@@ -116,7 +117,7 @@ func (a *API) FunctionApiList(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceAll
}
funcs, err := a.fissionClient.CoreV1().Functions(ns).List(metav1.ListOptions{})
funcs, err := a.fissionClient.CoreV1().Functions(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -152,7 +153,7 @@ func (a *API) FunctionApiCreate(w http.ResponseWriter, r *http.Request) {
return
}
fnew, err := a.fissionClient.CoreV1().Functions(f.ObjectMeta.Namespace).Create(&f)
fnew, err := a.fissionClient.CoreV1().Functions(f.ObjectMeta.Namespace).Create(context.TODO(), &f, metav1.CreateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -176,7 +177,7 @@ func (a *API) FunctionApiGet(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
f, err := a.fissionClient.CoreV1().Functions(ns).Get(name, metav1.GetOptions{})
f, err := a.fissionClient.CoreV1().Functions(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -213,7 +214,7 @@ func (a *API) FunctionApiUpdate(w http.ResponseWriter, r *http.Request) {
return
}
fnew, err := a.fissionClient.CoreV1().Functions(f.ObjectMeta.Namespace).Update(&f)
fnew, err := a.fissionClient.CoreV1().Functions(f.ObjectMeta.Namespace).Update(context.TODO(), &f, metav1.UpdateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -235,7 +236,7 @@ func (a *API) FunctionApiDelete(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
err := a.fissionClient.CoreV1().Functions(ns).Delete(name, &metav1.DeleteOptions{})
err := a.fissionClient.CoreV1().Functions(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -298,7 +299,7 @@ func (a *API) FunctionPodLogs(w http.ResponseWriter, r *http.Request) {
podNs = ns
}
f, err := a.fissionClient.CoreV1().Functions(ns).Get(fnName, metav1.GetOptions{})
f, err := a.fissionClient.CoreV1().Functions(ns).Get(context.TODO(), fnName, metav1.GetOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -310,7 +311,7 @@ func (a *API) FunctionPodLogs(w http.ResponseWriter, r *http.Request) {
fv1.ENVIRONMENT_NAME: f.Spec.Environment.Name,
fv1.ENVIRONMENT_NAMESPACE: f.Spec.Environment.Namespace,
}
podList, err := a.kubernetesClient.CoreV1().Pods(podNs).List(metav1.ListOptions{
podList, err := a.kubernetesClient.CoreV1().Pods(podNs).List(context.TODO(), metav1.ListOptions{
LabelSelector: labels.Set(selector).AsSelector().String(),
})
if err != nil {
@@ -346,7 +347,7 @@ func getContainerLog(kubernetesClient *kubernetes.Clientset, w http.ResponseWrit
podLogOpts := apiv1.PodLogOptions{Container: container.Name} // Only the env container, not fetcher
podLogsReq := kubernetesClient.CoreV1().Pods(pod.Namespace).GetLogs(pod.ObjectMeta.Name, &podLogOpts)
podLogs, err := podLogsReq.Stream()
podLogs, err := podLogsReq.Stream(context.Background())
if err != nil {
return errors.Wrapf(err, "error streaming pod log")
}
pkg/controller/httpTriggerApi.go
+7 -6
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
@@ -105,7 +106,7 @@ func (a *API) HTTPTriggerApiList(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceAll
}
triggers, err := a.fissionClient.CoreV1().HTTPTriggers(ns).List(metav1.ListOptions{})
triggers, err := a.fissionClient.CoreV1().HTTPTriggers(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -122,7 +123,7 @@ func (a *API) HTTPTriggerApiList(w http.ResponseWriter, r *http.Request) {
// checkHTTPTriggerDuplicates checks whether the tuple (Method, Host, URL) is duplicate or not.
func (a *API) checkHTTPTriggerDuplicates(t *fv1.HTTPTrigger) error {
triggers, err := a.fissionClient.CoreV1().HTTPTriggers(metav1.NamespaceAll).List(metav1.ListOptions{})
triggers, err := a.fissionClient.CoreV1().HTTPTriggers(metav1.NamespaceAll).List(context.TODO(), metav1.ListOptions{})
if err != nil {
return err
}
@@ -168,7 +169,7 @@ func (a *API) HTTPTriggerApiCreate(w http.ResponseWriter, r *http.Request) {
return
}
tnew, err := a.fissionClient.CoreV1().HTTPTriggers(t.ObjectMeta.Namespace).Create(&t)
tnew, err := a.fissionClient.CoreV1().HTTPTriggers(t.ObjectMeta.Namespace).Create(context.TODO(), &t, metav1.CreateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -192,7 +193,7 @@ func (a *API) HTTPTriggerApiGet(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
t, err := a.fissionClient.CoreV1().HTTPTriggers(ns).Get(name, metav1.GetOptions{})
t, err := a.fissionClient.CoreV1().HTTPTriggers(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -236,7 +237,7 @@ func (a *API) HTTPTriggerApiUpdate(w http.ResponseWriter, r *http.Request) {
return
}
tnew, err := a.fissionClient.CoreV1().HTTPTriggers(t.ObjectMeta.Namespace).Update(&t)
tnew, err := a.fissionClient.CoreV1().HTTPTriggers(t.ObjectMeta.Namespace).Update(context.TODO(), &t, metav1.UpdateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -258,7 +259,7 @@ func (a *API) HTTPTriggerApiDelete(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
err := a.fissionClient.CoreV1().HTTPTriggers(ns).Delete(name, &metav1.DeleteOptions{})
err := a.fissionClient.CoreV1().HTTPTriggers(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/mqTriggerApi.go
+6 -5
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"encoding/json"
"io/ioutil"
"net/http"
@@ -105,7 +106,7 @@ func (a *API) MessageQueueTriggerApiList(w http.ResponseWriter, r *http.Request)
ns = metav1.NamespaceAll
}
triggers, err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).List(metav1.ListOptions{})
triggers, err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -139,7 +140,7 @@ func (a *API) MessageQueueTriggerApiCreate(w http.ResponseWriter, r *http.Reques
return
}
tnew, err := a.fissionClient.CoreV1().MessageQueueTriggers(mqTrigger.ObjectMeta.Namespace).Create(&mqTrigger)
tnew, err := a.fissionClient.CoreV1().MessageQueueTriggers(mqTrigger.ObjectMeta.Namespace).Create(context.TODO(), &mqTrigger, metav1.CreateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -162,7 +163,7 @@ func (a *API) MessageQueueTriggerApiGet(w http.ResponseWriter, r *http.Request)
ns = metav1.NamespaceDefault
}
mqTrigger, err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).Get(name, metav1.GetOptions{})
mqTrigger, err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -198,7 +199,7 @@ func (a *API) MessageQueueTriggerApiUpdate(w http.ResponseWriter, r *http.Reques
return
}
tnew, err := a.fissionClient.CoreV1().MessageQueueTriggers(mqTrigger.ObjectMeta.Namespace).Update(&mqTrigger)
tnew, err := a.fissionClient.CoreV1().MessageQueueTriggers(mqTrigger.ObjectMeta.Namespace).Update(context.TODO(), &mqTrigger, metav1.UpdateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -220,7 +221,7 @@ func (a *API) MessageQueueTriggerApiDelete(w http.ResponseWriter, r *http.Reques
ns = metav1.NamespaceDefault
}
err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).Delete(name, &metav1.DeleteOptions{})
err := a.fissionClient.CoreV1().MessageQueueTriggers(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/packageApi.go
+6 -5
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
@@ -105,7 +106,7 @@ func (a *API) PackageApiList(w http.ResponseWriter, r *http.Request) {
if len(ns) == 0 {
ns = metav1.NamespaceAll
}
funcs, err := a.fissionClient.CoreV1().Packages(ns).List(metav1.ListOptions{})
funcs, err := a.fissionClient.CoreV1().Packages(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -155,7 +156,7 @@ func (a *API) PackageApiCreate(w http.ResponseWriter, r *http.Request) {
return
}
fnew, err := a.fissionClient.CoreV1().Packages(f.ObjectMeta.Namespace).Create(&f)
fnew, err := a.fissionClient.CoreV1().Packages(f.ObjectMeta.Namespace).Create(context.TODO(), &f, metav1.CreateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -180,7 +181,7 @@ func (a *API) PackageApiGet(w http.ResponseWriter, r *http.Request) {
}
raw := r.FormValue("raw") // just the deployment pkg
f, err := a.fissionClient.CoreV1().Packages(ns).Get(name, metav1.GetOptions{})
f, err := a.fissionClient.CoreV1().Packages(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -222,7 +223,7 @@ func (a *API) PackageApiUpdate(w http.ResponseWriter, r *http.Request) {
return
}
fnew, err := a.fissionClient.CoreV1().Packages(f.ObjectMeta.Namespace).Update(&f)
fnew, err := a.fissionClient.CoreV1().Packages(f.ObjectMeta.Namespace).Update(context.TODO(), &f, metav1.UpdateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -244,7 +245,7 @@ func (a *API) PackageApiDelete(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
err := a.fissionClient.CoreV1().Packages(ns).Delete(name, &metav1.DeleteOptions{})
err := a.fissionClient.CoreV1().Packages(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/secretApi.go
+2 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"net/http"
"github.com/gorilla/mux"
@@ -32,7 +33,7 @@ func (a *API) SecretExists(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
_, err := a.kubernetesClient.CoreV1().Secrets(ns).Get(name, metav1.GetOptions{})
_, err := a.kubernetesClient.CoreV1().Secrets(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.logger.Error("error getting secret",
zap.Error(err),
pkg/controller/timeTriggerApi.go
+6 -5
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"encoding/json"
"io/ioutil"
"net/http"
@@ -105,7 +106,7 @@ func (a *API) TimeTriggerApiList(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceAll
}
triggers, err := a.fissionClient.CoreV1().TimeTriggers(ns).List(metav1.ListOptions{})
triggers, err := a.fissionClient.CoreV1().TimeTriggers(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -149,7 +150,7 @@ func (a *API) TimeTriggerApiCreate(w http.ResponseWriter, r *http.Request) {
return
}
tnew, err := a.fissionClient.CoreV1().TimeTriggers(t.ObjectMeta.Namespace).Create(&t)
tnew, err := a.fissionClient.CoreV1().TimeTriggers(t.ObjectMeta.Namespace).Create(context.TODO(), &t, metav1.CreateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -173,7 +174,7 @@ func (a *API) TimeTriggerApiGet(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
t, err := a.fissionClient.CoreV1().TimeTriggers(ns).Get(name, metav1.GetOptions{})
t, err := a.fissionClient.CoreV1().TimeTriggers(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -218,7 +219,7 @@ func (a *API) TimeTriggerApiUpdate(w http.ResponseWriter, r *http.Request) {
return
}
tnew, err := a.fissionClient.CoreV1().TimeTriggers(t.ObjectMeta.Namespace).Update(&t)
tnew, err := a.fissionClient.CoreV1().TimeTriggers(t.ObjectMeta.Namespace).Update(context.TODO(), &t, metav1.UpdateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -240,7 +241,7 @@ func (a *API) TimeTriggerApiDelete(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
err := a.fissionClient.CoreV1().TimeTriggers(ns).Delete(name, &metav1.DeleteOptions{})
err := a.fissionClient.CoreV1().TimeTriggers(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil {
a.respondWithError(w, err)
return
pkg/controller/watchApi.go
+5 -4
View File
@@ -17,6 +17,7 @@ limitations under the License.
package controller
import (
"context"
"encoding/json"
"io/ioutil"
"net/http"
@@ -104,7 +105,7 @@ func (a *API) WatchApiList(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceAll
}
watches, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).List(metav1.ListOptions{})
watches, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).List(context.TODO(), metav1.ListOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -142,7 +143,7 @@ func (a *API) WatchApiCreate(w http.ResponseWriter, r *http.Request) {
return
}
wnew, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(watch.ObjectMeta.Namespace).Create(&watch)
wnew, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(watch.ObjectMeta.Namespace).Create(context.TODO(), &watch, metav1.CreateOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -166,7 +167,7 @@ func (a *API) WatchApiGet(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
watch, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).Get(name, metav1.GetOptions{})
watch, err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).Get(context.TODO(), name, metav1.GetOptions{})
if err != nil {
a.respondWithError(w, err)
return
@@ -194,7 +195,7 @@ func (a *API) WatchApiDelete(w http.ResponseWriter, r *http.Request) {
ns = metav1.NamespaceDefault
}
err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).Delete(name, &metav1.DeleteOptions{})
err := a.fissionClient.CoreV1().KubernetesWatchTriggers(ns).Delete(context.TODO(), name, metav1.DeleteOptions{})
if err != nil {
a.respondWithError(w, err)
return