-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Custom improvements for OpenShift (#825)
* Custom improvements for OpenShift Signed-off-by: Matej Vasek <mvasek@redhat.com> * fixup: osh cred loader Signed-off-by: Matej Vasek <mvasek@redhat.com> * fixup: style Signed-off-by: Matej Vasek <mvasek@redhat.com> * fixup: dns-err detec for fallback in cluster dial Signed-off-by: Matej Vasek <mvasek@redhat.com>
- Loading branch information
1 parent
fba0189
commit 4fec4af
Showing
7 changed files
with
249 additions
and
13 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
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,166 @@ | ||
| package openshift | ||
|
|
||
| import ( | ||
| "context" | ||
| "crypto/x509" | ||
| "encoding/pem" | ||
| "errors" | ||
| "strings" | ||
| "sync" | ||
| "time" | ||
|
|
||
| v1 "k8s.io/api/core/v1" | ||
| k8sErrors "k8s.io/apimachinery/pkg/api/errors" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/fields" | ||
| "k8s.io/apimachinery/pkg/util/rand" | ||
|
|
||
| "knative.dev/kn-plugin-func/docker" | ||
| "knative.dev/kn-plugin-func/docker/creds" | ||
| fnhttp "knative.dev/kn-plugin-func/http" | ||
| "knative.dev/kn-plugin-func/k8s" | ||
| ) | ||
|
|
||
| const ( | ||
| registryHost = "image-registry.openshift-image-registry.svc" | ||
| registryHostPort = registryHost + ":5000" | ||
| ) | ||
|
|
||
| func GetServiceCA(ctx context.Context) (*x509.Certificate, error) { | ||
| client, ns, err := k8s.NewClientAndResolvedNamespace("") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| cfgMapName := "service-ca-config-" + rand.String(5) | ||
|
|
||
| cfgMap := &v1.ConfigMap{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: cfgMapName, | ||
| Annotations: map[string]string{"service.beta.openshift.io/inject-cabundle": "true"}, | ||
| }, | ||
| } | ||
|
|
||
| configMaps := client.CoreV1().ConfigMaps(ns) | ||
|
|
||
| nameSelector := fields.OneTermEqualSelector("metadata.name", cfgMapName).String() | ||
| listOpts := metav1.ListOptions{ | ||
| Watch: true, | ||
| FieldSelector: nameSelector, | ||
| } | ||
|
|
||
| watch, err := configMaps.Watch(ctx, listOpts) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer watch.Stop() | ||
|
|
||
| crtChan := make(chan string) | ||
| go func() { | ||
| for event := range watch.ResultChan() { | ||
| cm, ok := event.Object.(*v1.ConfigMap) | ||
| if !ok { | ||
| continue | ||
| } | ||
| if crt, ok := cm.Data["service-ca.crt"]; ok { | ||
| crtChan <- crt | ||
| close(crtChan) | ||
| break | ||
| } | ||
| } | ||
| }() | ||
|
|
||
| _, err = configMaps.Create(ctx, cfgMap, metav1.CreateOptions{}) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| defer func() { | ||
| _ = configMaps.Delete(ctx, cfgMapName, metav1.DeleteOptions{}) | ||
| }() | ||
|
|
||
| select { | ||
| case crt := <-crtChan: | ||
| blk, _ := pem.Decode([]byte(crt)) | ||
| return x509.ParseCertificate(blk.Bytes) | ||
| case <-time.After(time.Second * 5): | ||
| return nil, errors.New("failed to get OpenShift's service CA in time") | ||
| } | ||
| } | ||
|
|
||
| // WithOpenShiftServiceCA enables trust to OpenShift's service CA for internal image registry | ||
| func WithOpenShiftServiceCA() fnhttp.Option { | ||
| var selectCA func(ctx context.Context, serverName string) (*x509.Certificate, error) | ||
| ca, err := GetServiceCA(context.TODO()) | ||
| if err == nil { | ||
| selectCA = func(ctx context.Context, serverName string) (*x509.Certificate, error) { | ||
| if strings.HasPrefix(serverName, registryHost) { | ||
| return ca, nil | ||
| } | ||
| return nil, nil | ||
| } | ||
| } | ||
| return fnhttp.WithSelectCA(selectCA) | ||
| } | ||
|
|
||
| func GetDefaultRegistry() string { | ||
| ns, _ := k8s.GetNamespace("") | ||
| if ns == "" { | ||
| ns = "default" | ||
| } | ||
|
|
||
| return registryHostPort + "/" + ns | ||
| } | ||
|
|
||
| func GetDockerCredentialLoaders() []creds.CredentialsCallback { | ||
| conf := k8s.GetClientConfig() | ||
|
|
||
| rawConf, err := conf.RawConfig() | ||
| if err != nil { | ||
| return nil | ||
| } | ||
|
|
||
| cc := rawConf.Contexts[rawConf.CurrentContext] | ||
| authInfo := rawConf.AuthInfos[cc.AuthInfo] | ||
|
|
||
| var user string | ||
| parts := strings.SplitN(cc.AuthInfo, "/", 2) | ||
| if len(parts) >= 1 { | ||
| user = parts[0] | ||
| } else { | ||
| return nil | ||
| } | ||
| credentials := docker.Credentials{ | ||
| Username: user, | ||
| Password: authInfo.Token, | ||
| } | ||
|
|
||
| return []creds.CredentialsCallback{ | ||
| func(registry string) (docker.Credentials, error) { | ||
| if registry == registryHostPort { | ||
| return credentials, nil | ||
| } | ||
| return docker.Credentials{}, nil | ||
| }, | ||
| } | ||
|
|
||
| } | ||
|
|
||
| var isOpenShift bool | ||
| var checkOpenShiftOnce sync.Once | ||
|
|
||
| func IsOpenShift() bool { | ||
| checkOpenShiftOnce.Do(func() { | ||
| client, err := k8s.NewKubernetesClientset() | ||
| if err != nil { | ||
| isOpenShift = false | ||
| return | ||
| } | ||
| _, err = client.CoreV1().Services("openshift-image-registry").Get(context.TODO(), "image-registry", metav1.GetOptions{}) | ||
| if k8sErrors.IsNotFound(err) { | ||
| isOpenShift = false | ||
| return | ||
| } | ||
| isOpenShift = true | ||
| }) | ||
| return isOpenShift | ||
| } |
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,31 @@ | ||
| package openshift_test | ||
|
|
||
| import ( | ||
| "net/http" | ||
|
|
||
| "testing" | ||
|
|
||
| fnhttp "knative.dev/kn-plugin-func/http" | ||
| "knative.dev/kn-plugin-func/openshift" | ||
| ) | ||
|
|
||
| func TestRoundTripper(t *testing.T) { | ||
| if !openshift.IsOpenShift() { | ||
| t.Skip("The cluster in not an instance of OpenShift.") | ||
| return | ||
| } | ||
|
|
||
| transport := fnhttp.NewRoundTripper(openshift.WithOpenShiftServiceCA()) | ||
| defer transport.Close() | ||
|
|
||
| client := http.Client{ | ||
| Transport: transport, | ||
| } | ||
|
|
||
| resp, err := client.Get("https://image-registry.openshift-image-registry.svc.cluster.local:5000/v2/") | ||
| if err != nil { | ||
| t.Error(err) | ||
| return | ||
| } | ||
| defer resp.Body.Close() | ||
| } |