diff --git a/README.md b/README.md index 4420eed03..1040f5efb 100644 --- a/README.md +++ b/README.md @@ -140,12 +140,6 @@ Apply the configuration file above once the values for your environment are defi ``` kubectl apply -n securesign -f rhtas-deployment.yaml ``` -Because an image of netcat is used from `registry.redhat.io` it is required to provide credentials to registry.redhat.io. The below assumes that an authentication file has been created in the `/tmp` directory. - -``` -kubectl create secret generic pull-secret -n securesign --from-file=.dockerconfigjson=/tmp/config.json --type=kubernetes.io/dockerconfigjson -``` - ### Verifying signatures To verify RHTAS is working as expected we will initialize to TUF. diff --git a/controllers/constants/config.go b/controllers/constants/config.go index 34195642b..bc8dcf3df 100644 --- a/controllers/constants/config.go +++ b/controllers/constants/config.go @@ -1,7 +1,5 @@ package constants - - var ( CreateTreeDeadline int64 = 1200 ) diff --git a/controllers/ctlog/actions/rbac.go b/controllers/ctlog/actions/rbac.go index 803d98c85..45063ecb9 100644 --- a/controllers/ctlog/actions/rbac.go +++ b/controllers/ctlog/actions/rbac.go @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.CTlog) * Namespace: instance.Namespace, Labels: labels, }, - ImagePullSecrets: []v1.LocalObjectReference{ - { - Name: "pull-secret", - }, - }, } if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil { diff --git a/controllers/fulcio/actions/rbac.go b/controllers/fulcio/actions/rbac.go index 1987df33a..0b2857d93 100644 --- a/controllers/fulcio/actions/rbac.go +++ b/controllers/fulcio/actions/rbac.go @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Fulcio) Namespace: instance.Namespace, Labels: labels, }, - ImagePullSecrets: []v1.LocalObjectReference{ - { - Name: "pull-secret", - }, - }, } if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil { diff --git a/controllers/rekor/actions/rbac.go b/controllers/rekor/actions/rbac.go index 6960d49a6..c290e951f 100644 --- a/controllers/rekor/actions/rbac.go +++ b/controllers/rekor/actions/rbac.go @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Rekor) * Namespace: instance.Namespace, Labels: labels, }, - ImagePullSecrets: []v1.LocalObjectReference{ - { - Name: "pull-secret", - }, - }, } if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil { diff --git a/controllers/trillian/actions/rbac.go b/controllers/trillian/actions/rbac.go index 69d18961e..161220e07 100644 --- a/controllers/trillian/actions/rbac.go +++ b/controllers/trillian/actions/rbac.go @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Trillian Namespace: instance.Namespace, Labels: labels, }, - ImagePullSecrets: []v1.LocalObjectReference{ - { - Name: "pull-secret", - }, - }, } if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil { diff --git a/controllers/tuf/actions/rbac.go b/controllers/tuf/actions/rbac.go index 66f229380..15c750cef 100644 --- a/controllers/tuf/actions/rbac.go +++ b/controllers/tuf/actions/rbac.go @@ -44,11 +44,6 @@ func (i rbacAction) Handle(ctx context.Context, instance *rhtasv1alpha1.Tuf) *ac Namespace: instance.Namespace, Labels: labels, }, - ImagePullSecrets: []v1.LocalObjectReference{ - { - Name: "pull-secret", - }, - }, } if err = ctrl.SetControllerReference(instance, sa, i.Client.Scheme()); err != nil { diff --git a/e2e/cli_server_test.go b/e2e/cli_server_test.go index 546a9f5ad..1e1fc81a7 100644 --- a/e2e/cli_server_test.go +++ b/e2e/cli_server_test.go @@ -19,10 +19,10 @@ const cliServerNs = "trusted-artifact-signer" var _ = Describe("CliServer", Ordered, func() { var ( - cli ctrl.Client + cli ctrl.Client httpClient *http.Client - url string - ctx = context.TODO() + url string + ctx = context.TODO() ) BeforeAll(func() { diff --git a/hack/up.sh b/hack/up.sh index 50df2e2b8..24508a473 100644 --- a/hack/up.sh +++ b/hack/up.sh @@ -49,5 +49,4 @@ do sleep 10 done -make deploy && kubectl create -f config/samples/rhtas_v1alpha1_securesign.yaml && sleep 30 && kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-ctlog-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-fulcio-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-rekor-system ;kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-rekor-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-trillian-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-trillian-system ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-trusted-artifact-signer-clientserver ; kubectl create secret generic pull-secret --from-file=.dockerconfigjson=/tmp/pull-secret.txt --type=kubernetes.io/dockerconfigjson -n securesign-sample-tuf-system - +make deploy && kubectl create -f config/samples/rhtas_v1alpha1_securesign.yaml